diff --git a/ChangeLog b/ChangeLog index ac723511d75a..5cf7f1f45384 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3074 +1,3313 @@ +2021-01-10 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20210110 + Merge with NetBSD make, pick up + o fix lint warnings + o consistently use boolean expressions in conditions + +2021-01-08 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20210108 + Merge with NetBSD make, pick up + o job.c: back to polling token pipe if we want a token + o main.c: always print 'stopped in' on first call + The execption is if we bail because of an abort token + in which case just exit 6. + +2021-01-01 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20210101 + Merge with NetBSD make, pick up + o Happy New Year! + o rename CmdOpts.lint to strict + o exit 2 on technical errors + o replace pointers in controlling conditions with booleans + o replace global preserveUndefined with VARE_KEEP_UNDEF + o compat.c: re-export variables from the actual make process + if using vfork this is the effect anyway + o cond.c: clean up VarParseResult constants + o for.c: fix undefined behavior in SubstVarLong + make control flow in SubstVarLong of .for loops more obvious + clean up SubstVarShort in .for loops + extract ForSubstBody from ForReadMore + clean up ForReadMore + simplify termination condition for .for loop + add error handling for .for loop items + job.c: re-export variables from the actual make process + parse.c: remove mmap for loading files, only allow files < 1 GiB + fix edge case in := with undefined in variable name + skip variable expansion in ParseDependencyTargetWord + var.c: split ExportVar into separate functions + clean up code in extracted ExportVar functions + remove dead code from ApplyModifiersIndirect + split Var_Subst into easily understandable functions + clean up VarParseResult constants + +2020-12-25 Simon J Gerraty + + * main.c: use .MAKE.DEPENDFILE as set by makefiles + +2020-12-22 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20201222 + Merge with NetBSD make, pick up + o make DEBUG macro return boolean + o parse.c: fix assertion failure for files without trailing newline + o var.c: allow .undef to undefine multiple variables at once + remove excess newline from parse errors + +2020-12-21 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20201221 + Merge with NetBSD make, pick up + o some unit-test updates + +2020-12-20 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20201220 + Merge with NetBSD make, pick up + o more unit tests + o return FStr from Var_Parse and Var_Value + o spell nonexistent consistently + o add str_basename to reduce duplicate code + o compat.c: fix .ERROR_TARGET in compat -k mode + extract InitSignals from Compat_Run + extract UseShell from Compat_RunCommand + o cond.c: error out if an '.endif' or '.else' contain extraneous text + o for.c: rename ForIterate to ForReadMore + o hash.c: clean up hash function for HashTable + o lst.c: rename Vector.priv_cap to cap + o main.c: remove constant parameter from MakeMode + o make.c: use symbolic time for 0 in Make_Recheck + extract MakeChildren from MakeStartJobs + o parse.c: clean up memory handling in VarAssign_EvalShell, Parse_DoVar + fix error message for .info/.warning/.error without argument + extract Var_Undef from ParseDirective + extract ParseSkippedBranches, ParseForLoop from ParseReadLine + rename mode constants for ParseGetLine to be more expressive + reduce debugging details in Parse_SetInput + fix line numbers in .for loops + split ParseGetLine into separate functions + fix garbled output for failed shell command + var.c: remove redundant assignment in ApplyModifier_SysV + error out on unknown variable modifiers at parse time + remove wrong error message for indirect modifier in lint mode + extract ApplySingleModifier from ApplyModifiers + use FStr for memory management in Var_SetWithFlags + extract SetVar from Var_SetWithFlags + use FStr in VarNew + extract string functions from ApplyModifier_To + error out if .undef has not exactly 1 argument + extract Var_DeleteVar from Var_Delete + extract Var_Undef from ParseDirective + clean up memory management for expanding variable expressions + +2020-12-12 Simon J Gerraty + + * avoid %zu + + * lst.c: avoid anonymous union + + * VERSION (_MAKE_VERSION): 20201212 + Merge with NetBSD make, pick up + o more unit tests + o inline Targ_Ignore and Targ_Silent + o split JobFlags into separate fields + o remove const from function parameters (left overs from refactoring) + o eliminate boolean argument of Var_Export + o make API of Buf_Init simpler + o rename ParseRunOptions to ParseCommandFlags + o replace *line with line[0] + o compat.c: fix wrong exit status for multiple failed main targets + refactor Compat_Run to show the error condition more clearly + don't make .END if the main targets already failed (-k mode) + fix exit status in -k mode if a dependency fails + o for.c: clean up Buf_AddEscaped in .for loops + o job.c: extract ShellWriter_ErrOn from JobPrintCommand + make Job_Touch simpler + refactor JobFinish + rename Shell.exitFlag to errFlag + move Job.xtraced to ShellWriter + make printing of shell commands independent from the job + rename shell flags in struct Shell + extract JobOpenTmpFile from JobStart + rename RunFlags to CommandFlags + split various Job.* into separate fields + rename commandShell to shell + extract InitShellNameAndPath from Shell_Init + replace signal handling macros with local functions + replace macro MESSAGE with local function + parse.c: error out on null bytes in makefiles + error out on misspelled directives + rename IFile.nextbuf to readMore + fix undefined behavior in ParseEOF + str.c: remove redundant call to strlen in Str_Words + var.c: error out on misspelled .unexport-env + error out on misspelled .export directives + extract ExportVars from Var_Export + extract ExportVarsExpand from Var_Export + eliminate boolean argument of Var_Export + fix undefined behavior when exporting ${:U } + rename Var_ExportVars to Var_ReexportVars + rename Var_Export1 to ExportVar + +2020-12-06 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20201206 + Merge with NetBSD make, pick up + o more unit tests + o inline macros for debug logging + o use consistent variable names for list nodes + o define constants for enum zero-values + o dir.c: use fixed format for debug output of the directory cache + remove Dir_InitDir + o lst.c: inline Lst_Enqueue, Vector_Done + o meta.c: remove unused parameter from meta_needed + o parse.c: rename parse functions + o suff.c: extract ExpandChildrenRegular from ExpandChildren + o targ.c: don't concatenate identifiers in Targ_PrintType + o var.c: remove comment decoration + extract UnexportVars from Var_UnExport + extract GetVarnamesToUnexport from Var_UnExport + extract UnexportEnv from Var_UnExport + extract UnexportVar from Var_UnExport + move CleanEnv to UnexportVars + replace pointer comparisons with enum + add FStr to var.c to make memory handling simpler + use FStr in Var_UnExport + move type definitions in var.c to the top + extract FreeEnvVar from Var_Parse + extract ShuffleStrings from ApplyModifier_Order + +2020-11-30 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20201130 + Merge with NetBSD make, pick up + o add unit tests for META MODE + o reduce memory allocation for dirSearchPath, GNode.parents, + GNode.children, OpenDirs + o reduce pointer indirection for GNode.cohorts and + GNode.implicitParents + o remove pointer indirection from GNode.commands + o inline Lst_ForEachUntil in meta mode + o dir.c: fix memory leak for lstat cache in -DCLEANUP mode + clean up memory management for CachedDirs + fix the reference count of dotLast going negative + add debug logging for OpenDirs_Done + extract CacheNewDir from Dir_AddDir + add debug logging for reference counting of CachedDir + rename some Dir functions to SearchPath + o job.c: rename some global variables + o main.c: reduce memory allocation in ReadBuiltinRules + reduce memory allocation in CmdOpts.create, CmdOpts.variables, + CmdOpts.makefiles + Add .MAKE.UID and .MAKE.GID + o make.c: reduce memory allocation for/in toBeMade, + Make_ProcessWait, Make_ExpandUse + o meta.c: reduce memory allocation in meta_oodate + o parse.c: reduce memory allocations for parsing dependencies and + targets + o suff.c: reduce memory allocation in suffix handling + +2020-11-24 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20201124 + Merge with NetBSD make, pick up + o .MAKE.{UID,GID} represent uid and gid running make. + o fix error handling for .BEGIN and .END dependency in -k mode + o fix missing "Stop." after failed .END node in -k mode + o use properly typed comparisons in boolean contexts + o replace a few HashTable_CreateEntry with HashTable_Set + o add HashSet type + o compat.c: split Compat_Make into smaller functions + extract DebugFailedTarget from Compat_RunCommand + o dir.c: refactor Dir_UpdateMTime + migrate CachedDir.files from HashTable to HashSet + o make.c: add high-level API for GNode.made + +2020-11-22 Simon J Gerraty + + * VERSION (_MAKE_VERSION): 20201122 + Merge with NetBSD make, pick up + o rename GNode.context to vars + o suff.c: cleanup and refactor + rename some functions and vars to better reflect usage + add high-level API for CandidateSearcher + o targ.c: add more debug logging for suffix handling + o more unit tests + o add debug logging for setting and resetting the main target + 2020-11-17 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201117 Merge with NetBSD make, pick up - o fix some unit-tests when dash is .SHELL + o fix some unit-tests when .SHELL is dash o rename Targ_NewGN to GNode_New o make some GNode functions const o main.c: call Targ_Init before Var_Init cleanup PrintOnError, getTmpdir and ParseBoolean o var.c: fix error message of failed :!cmd! modifier 2020-11-14 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201114 Merge with NetBSD make, pick up o replace a few HashTable_CreateEntry with HashTable_Set o clean up cached_stats o rename DEFAULT to defaultNode o remove redundant struct make_stat o cond.c: in lint mode, check for ".else " use bitset for IfState replace large switch with if-else in Cond_EvalLine o job.c: clean up JobExec, JobStart, JobDoOutput use stderr for error message about failed touch clean up Job_Touch replace macro DBPRINTF with JobPrintln rename JobState to JobStatus main.c: switch cache for realpath from GNode to HashTable clean up Fatal clean up InitDefSysIncPath use progname instead of hard-coded 'make' in warning rename Main_SetVarObjdir to SetVarObjdir make.1: document the -S option make.c: fix debug output for GNode details use symbolic names in debug output of GNodes 2020-11-12 Simon J Gerraty * configure.in: fix --with-force-machine-arch * VERSION (_MAKE_VERSION): 20201112 Merge with NetBSD make, pick up o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable checks in InitObjdir. Explicit .OBJDIR target always allows read-only directory. o cond.c: clean up Cond_EvalLine 2020-11-11 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201111 Merge with NetBSD make, pick up o more unit-tests o style cleanup remove redundant parentheses from sizeof operator replace character literal 0 with '\0'. replace pointer literal 0 with NULL. remove redundant parentheses. replace (expr & mask) == 0 with !(expr & mask). use strict typing in conditions of the form !var o rename Make_OODate to GNode_IsOODate o rename Make_TimeStamp to GNode_UpdateYoungestChild o rename Var_Set_with_flags to Var_SetWithFlags o rename dieQuietly to shouldDieQuietly o buf.c: make API of Buf_Init simpler o compat.c: clean up Compat_Make, Compat_RunCommand, CompatDeleteTarget and CompatInterrupt o cond.c: in lint mode, only allow '&&' and '||', not '&' and '|' clean up CondParser_Comparison o main.c: rename getBoolean and s2Boolean rename MAKEFILE_PREFERENCE for consistency o parse.c: replace strstr in ParseMaybeSubMake with optimized code o var.c: rename VARE_ASSIGN to VARE_KEEP_DOLLAR replace emptyString with allocated empty string error out on unclosed expressions after the colon 2020-11-01 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201101 Merge with NetBSD make, pick up o negate NoExecute to GNode_ShouldExecute o job.c: rename JobMatchShell to FindShellByName extract EscapeShellDblQuot from JobPrintCommand extract ParseRunOptions from JobPrintCommand o var.c: extract ApplyModifiersIndirect from ApplyModifiers treat malformed :range, :ts and :[...] as errors add tests for the variable modifiers :[words] and :range 2020-10-31 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201031 Merge with NetBSD make, pick up o format #include directives consistently o do not look up local variables like .TARGET anywhere else o main.c: Main_SetObjdir is first called for curdir which may be readonly reduce the scope where recursive expressions are detected remove redundant :tl from getBoolean clean up mkTempFile o meta.c: simplify memory allocation in meta_create and meta_oodate o parse.c: extract loadedfile_mmap from loadfile o trace.c: document possible undefined behavior with .CURDIR o var.c: make parsing of the :gmtime and :localtime modifiers stricter rename ismeta to is_shell_metachar remove debug logging for the :Q variable modifier rename VarIsDynamic to VarnameIsDynamic use consistent parameter order in varname parsing functions extract ParseVarnameLong from Var_Parse extract ParseVarnameShort from Var_Parse fix type of ParseModifierPart parameter delim extract IsEscapedModifierPart from ParseModifierPart clean up ModifyWords add test for combining the :@ and :? variable modifiers 2020-10-30 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201030 Merge with NetBSD make, pick up o change char * to void * in Var_Value o make iterating over HashTable simpler o rename VAR_CMD to VAR_CMDLINE o cond.c: clean up is_separator fix parse error in string literal in conditional o main.c: do not use objdir that is not writable in lint mode, exit with error status on errors o parse.c: clean up StrContainsWord fix out-of-bounds pointer in ParseTrackInput o var.c: rename Str_SYSVMatch and its parameters remove unsatisfiable conditions in Var_Set_with_flags document where the variable name is expanded fix documentation for VARP_SUB_ONE rename VAR_EXPORTED_YES to VAR_EXPORTED_SOME document VAR_READONLY prevent appending to read-only variables extract MayExport from Var_Export1 remove redundant evaluations in VarFind replace VarFindFlags with a simple Boolean rename FIND_CMD to FIND_CMDLINE, to match VAR_CMDLINE 2020-10-28 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201028 Merge with NetBSD make, pick up o rename defIncPath to defSysIncPath o initialize all CmdOpts fields o lst.c: inline Vector_Get o main.c: refactor main extract InitMaxJobs,InitObjdir,InitVarMake,InitRandom, ReadMakefiles,CleanUp,InitVpath,ReadBuiltinRules, InitDefIncPath,CmdOpts_Init,UnlimitFiles o parse.c: merge curFile into includes rename predecessor to order_pred sort ParseSpecial alphabetically remove unused, undocumented .NOEXPORT rename ParseSpecial enum values consistently rename some fields of struct IFile 2020-10-26 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201026 Merge with NetBSD make, pick up o group the command line options and arguments into a struct o rename GNode.cmgn to youngestChild o rename hash functions to identify the type name o negate OP_NOP and rename it to GNode_IsTarget o add GNode_Path to access the path of a GNode o remove macros MIN and MAX o remove unused Lst_Find and Lst_FindFrom o arch.c: and make Arch_FindLib simpler clean up code layout make Arch_ParseArchive simpler o cond.c: inline CondFindStrMatch into FuncMake o dir.c: replace Dir_CopyDir with Dir_CopyDirSearchPath omit trailing space in debug output for expanding file patterns refactor DirMatchFiles document that the SearchPath of Dir_FindFile may be NULL remove UNCONST from Dir_Expand inline DirFindName o for.c: clean up code for handling .for loops o hash.c: print hash in debug log with fixed width clean up hash table functions reduce amount of string hashing o job.c: refactor JobDeleteTarget use proper enum constants for aborting convert result of JobStart from macros to enum convert abort reason macros to enum rework Job_CheckCommands to reduce indentation rename Shell fields add field names in declaration of DEFSHELL_CUSTOM convert JobState and JobFlags to enum types move handling of the "..." command to JobPrintCommands o lst.c: clean up refactor LstNodeNew remove Lst_Open, Lst_Next, Lst_Close remove code for circular lists from Lst_Next o main.c: do not attempt to read .MAKE.DEPENFILE if set to /dev/null or anything starting with "no" convert macros for debug flags into enum o make.c: inline Lst_Copy in Make_ExpandUse o meta.c: inline Lst_Find in meta_oodate make Lst_RemoveIf simpler in meta_oodate o parse.c: convert error level for Parse_Error to an enum o suff.c: properly terminate debug output with newline add more details to DEBUG_SRC log replace Dir_CopyDir with Dir_CopyDirSearchPath don't modify GNode name while rebuilding the suffix graph o var.c: reduce duplicate code in VarFind 2020-10-22 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201022 Merge with NetBSD make, pick up o more refactoring and simplification to reduce code size o var.c: extract CanonicalVarname from VarFind o make.c: extract UpdateImplicitParentsVars from Make_Update o main.c: extract PrintVar from doPrintVars extract HandlePWD from main o lst.c: inline simple Lst getters remove unused Lst_ForEach o job.c: move struct Shell from job.h to job.c o more unit tests 2020-10-19 Simon J Gerraty * configure.in: remove inappropriate use of AC_INCLUDES_DEFAULT 2020-10-18 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201018 Merge with NetBSD make, pick up o remove USE_IOVEC o rename some Hash_* apis to Hash* o replace execError with execDie o rename Lst_Init to Lst_New o add tags to enum types o rename Stack to Vector o parse.c: more refactoring o unit-tests: make some tests use line buffered stdout o unit-tests/Makefile: in meta mode do not make all tests depend on Makefile, it isn't necessary. 2020-10-10 Simon J Gerraty * main.c: check for CTL_HW being defined. * unit-tests/Makefile: ensure export tests output are POSIX compliant disable opt-debug-jobs test until it works on ubuntu * VERSION (_MAKE_VERSION): 20201010 Merge with NetBSD make, pick up o dir.c: remove pathname limit for Dir_FindHereOrAbove o hash.c: replace strcpy with memcpy in Hash_CreateEntry o main.c: extract init_machine and init_machine_arch from main allow to disable debug logging options o parse.c: enable format string truncation warnings extract parsing of sources from ParseDoDependency split ParseDoSrc into smaller functions hide implementation details from Parse_DoVar clean up parsing of variable assignments split Parse_DoVar into manageable pieces don't modify the given line during Parse_DoVar fix out-of-bounds memory access in Parse_DoVar fix parsing of the :sh assignment modifier o var.c: rework memory allocation for the name of variables extract ApplyModifier_Literal into separate function in lint mode, reject modifiers without delimiter do not export variable names starting with '-' o fix double-free bug in -DCLEANUP mode o more cleanup to enable higher warnings level o more unit tests 2020-10-02 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201002 Merge with NetBSD make, pick up o dir.c: use hash table for looking up open directories by name o main.c: clean up option handling o parse.c: add missing const for Parse_AddIncludeDir o var.c: ApplyModifier_To, update pp in each branch o remove redundant function prototypes o more unit tests 2020-10-01 Simon J Gerraty * VERSION (_MAKE_VERSION): 20201001 Merge with NetBSD make, pick up o compat.c: comment about "..." 2020-09-30 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200930 Merge with NetBSD make, pick up o job.c: split Job.jobPipe into 2 separate fields replace Lst_Open with direct iteration o lst.c: remove redundant assertions o targ.c: replace Lst_Open with direct iteration o var.c: fix bug in evaluation of indirect variable modifiers extract ApplyModifier_Quote into separate function o make debug logging simpler 2020-09-27 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200927 Merge with NetBSD make, pick up o parse.c: ensure parse errors result in 'stopped in' message. o compat.c: make parameter of Compat_RunCommand const o main.c: extract InitVarTarget from main o parse.c: rename ParseFinishLine to FinishDependencyGroup refactor ParseDoDependency o var.c: Var_Subst no longer returns string result rename Var_ParsePP back to Var_Parse in lint mode, improve error handling for undefined variables extract ParseVarname from Var_Parse o rename Lst_ForEach to Lst_ForEachUntil o inline Lst_ForEachUntil in several cases o clean up API for finding and creating GNodes o fix assertion failure in -j mode with .END node o inline and remove LstNode_Prev and LstNode_Next o use fine-grained type names for lists and their nodes o more unit tests 2020-09-11 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200911 Merge with NetBSD make, pick up o cond.c: split EvalComparison into smaller functions reorder parameters of condition parsing functions reduce code size in CondParser_Eval rename CondGetString to CondParser_String add CondLexer_SkipWhitespace group the condition parsing state into a struct in CondGetString, replace repeated Buf_Add with Buf_AddStr o migrate Var_Parse to Var_ParsePP o add wrappers around ctype.h functions o lst.c: use a stack instead of a list for the nested include path o more unit tests 2020-09-04 Simon J Gerraty * make-bootstrap.sh.in: adjust object list 2020-09-02 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200902 Merge with NetBSD make, pick up o use make_stat to ensure no confusion over valid fields returned by cached_stat o var.c: make VarQuote const-correct o add unit tests for .for 2020-09-01 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200901 Merge with NetBSD make, pick up o rename Hash_Table fields o make data types in Dir_HasWildcards more precise 2020-08-31 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200831 Merge with NetBSD make, pick up o suff.c: fix unbalanced Lst_Open/Lst_Close in SuffFindCmds o lst.c: Lst_Open renable assert that list isn't open o unit test for .TARGET dependent flags o var.c: fix aliasing bug in VarUniq o more unit tests for :u 2020-08-30 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200830 Merge with NetBSD make, pick up o allow for strict type checking for Boolean o Var_Parse never returns NULL o Var_Subst never returns NULL o Lst_Find now takes boolean match function o rename Lst_Memeber to Lst_FindDatum o rename LstNode functions to match their type o rename GNode.iParents to implicitParents o fix assertion failure for .SUFFIXES in archives o compat.c: clean up documentation for CompatInterrupt and Compat_Run remove unreachable code from CompatRunCommand o main.c: simplify getBoolean o stc.c: replace brk_string with simpler Str_Words o suff.c: add debug macros 2020-08-28 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200828 Merge with NetBSD make, pick up o lst.c: inline LstIsValid and LstNodeIsValid o remove trailing S from Lst function names after migration complete o more comment cleanup/clarification o suff.c: clean up suffix handling o more unit tests 2020-08-26 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200826 Merge with NetBSD make, pick up o enum.c: distinguish between bitsets containing flags and ordinary enums o var.c: fix error message for ::!= modifier with shell error o fix bugs in -DCLEANUP mode 2020-08-24 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200824 Merge with NetBSD make, pick up o in debug mode, print GNode details in symbols 2020-08-23 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200823 Merge with NetBSD make, pick up o lst.c: more asserts, make args to Lst_Find match others. o var.c: pass flags to VarAdd o arch.c: use Buffer o str.c: brk_string return size_t for nwords o more unit tests 2020-08-22 Simon J Gerraty * VERSION (_MAKE_VERSION): Merge with NetBSD make, pick up o var.c: support for read-only variables eg .SHELL being the shell used to run scripts. o lst.c: more simplification o more documentation and style cleanup o more unit tests o ensure unit-test/Makefile is run by TEST_MAKE o reduce duplication of header inclusion 2020-08-21 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200821 Merge with NetBSD make, pick up o lst.c: revert invalid assertion - but document it o dir.c: split Dir_Init into two functions 2020-08-20 Simon J Gerraty * lst.c: needs inttypes.h on Linux * VERSION (_MAKE_VERSION): 20200820 Merge with NetBSD make, pick up o make.1: clarify some passages o var.c: more cleanup, clarify comments o make_malloc.c: remove unreachable code o cond.c: make CondGetString easier to debug o simplify list usage o unit-tests: more 2020-08-16 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200816 Merge with NetBSD make, pick up o refactor unit-tests to be more fine grained not all tests moved yet 2020-08-14 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200814 Merge with NetBSD make, pick up o more str_concat variants o more enums for flags o var.c: cleanup for higher warnings level 2020-08-10 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200810 Merge with NetBSD make, pick up o more unit tests o general comment and style cleanup 2020-08-08 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200808 Merge with NetBSD make, pick up o enum.[ch]: streamline, enums for use in flags and debug output o cond.c: cleanup o var.c: reduce duplicate code for modifiers debug logging for Var_Parse more detailed debug output o more unit tests 2020-08-06 Simon J Gerraty * unit-tests/Makefile: -r for recursive and include Makefile.inc so I can run tests in meta mode supress extra noise if in meta mode * VERSION (_MAKE_VERSION): 20200806 Merge with NetBSD make, pick up o parse.c: remove VARE_WANTRES for LINT we just want to check parsing (for now). 2020-08-05 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200805 Merge with NetBSD make, pick up o make.1: Rework the description of dependence operators 2020-08-03 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200803 Merge with NetBSD make, pick up o revert some C99 usage, for max portability o unit-tests/lint 2020-08-02 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200802 Merge with NetBSD make, pick up o more unit tests 2020-08-01 Simon J Gerraty * Remove NetBSD specific plumbing from unit-tests/Makefile * VERSION (_MAKE_VERSION): 20200801 Merge with NetBSD make, pick up o make Var_Value return const o size_t for buf sizes o optimize some buffer operations - avoid strlen 2020-07-31 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200731 Merge with NetBSD make, pick up o var.c: fix undefinded behavior for incomplete :t modifier fixes unit-test/moderrs on Ubuntu o parse.c: When parsing variable assignments other than := if DEBUG(LINT) test substition of value, so we get a file and line number in the resulting error. o dir.c: fix parsing of nested braces in dependency lines add unit-tests 2020-07-30 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200730 Merge with NetBSD make, pick up o var.c: minor cleanup o unit-tests: more tests to improve code coverage 2020-07-28 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200728 Merge with NetBSD make, pick up o var.c: more optimizations 2020-07-26 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200726 Merge with NetBSD make, pick up o collapse lsd.lib into lst.c - reduce code size and allow inlining o lots of function comment updates o var.c: more optimizations o make return of Var_Parse const 2020-07-20 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200720 Merge with NetBSD make, pick up o DEBUG_HASH report stats at end and tone down the noise o var.c: each flag type gets its own prefix. move SysV string matching to var.c make ampersand in ${VAR:from=to&} an ordinary character cleanup and simplify implementation of modifiers o make.1: move documentation for assignment modifiers 2020-07-18 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200718 Merge with NetBSD make, pick up o DEBUG_HASH to see how well the hash tables are working 2020-07-11 Simon J Gerraty * bsd.after-import.mk: make sure we update unit-tests/Makefile 2020-07-10 Simon J Gerraty * configure.in: use AC_INCLUDES_DEFAULT rather than AC_HEADER_STDC * VERSION (_MAKE_VERSION): 20200710 Merge with NetBSD make, pick up o filemon/filemon_dev.c: use O_CLOEXEC rather than extra syscall o meta.c: target flagged .META is out-of-date if meta file missing 2020-07-09 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200709 Merge with NetBSD make, pick up o cond.c: fix for compare_expression when doEval=0 o unit-tests/Makefile: rework o filemon/filemon_dev.c: ensure filemon fd is closed on exec. 2020-07-04 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200704 Merge with NetBSD make, pick up (most of this by rillig@) o lots of style and white-space cleanup o lots more unit tests for variable modifiers o simplified description of some functions o str.c: refactor Str_Match o var.c: debugging output for :@ constify VarModify parameter fix :hash modifier on 16-bit platforms remove unnecessary forward declarations refactor ApplyModifier_SysV to have less indentation simplify code for :E and :R clean up code for :H and :T refactor ApplyModifiers * var.c: we need stdint.h on some platforms to get uint32_t * unit-test/Makefile: we need to supress the specific error for RE substitution error in modmisc, since it varies accross different OS. 2020-07-02 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200702 Merge with NetBSD make, pick up o var.c: more improvements to avoiding unnecessary evaluation use enums for flags o remove flags arg to Var_Set which outside of var.c is always 0 2020-07-01 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200701 Merge with NetBSD make, pick up o var.c: with change to cond.c; ensure that nested variables within a variable name are expanded. o unit-tests/varmisc.mk: test for nested varname 2020-06-29 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200629 Merge with NetBSD make, pick up o cond.c: do not eval unnecessary terms of conditionals. 2020-06-25 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200625 Merge with NetBSD make, pick up o meta.c: report error if lseek in filemon_read fails 2020-06-22 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200622 Merge with NetBSD make, pick up o dieQuietly: ignore OP_SUBMAKE as too aggressive 2020-06-19 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200619 Merge with NetBSD make, pick up o str.c: performance improvement for Str_Match for multiple '*' o dieQuietly: supress the failure output from make when failing node is a sub-make or a sibling failed. This cuts down greatly on unhelpful noise at the end of build log. Disabled by -dj or .MAKE.DIE_QUIETLY=no 2020-06-10 Simon J Gerraty * FILES: add LICENSE to appease some packagers. This is an attempt to fairly represent the license on almost 200 files, which are almost all BSD-3-Clause The few exceptions being more liberal. * VERSION (_MAKE_VERSION): 20200610 Merge with NetBSD make, pick up o unit test for :Or 2020-06-06 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200606 Merge with NetBSD make, pick up o make.1: cleanup * Makefile: fix depends for main.o which broke MAKE_VERSION 2020-06-05 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200605 Merge with NetBSD make, pick up o dir.c: cached_stats - don't confuse stat and lstat results. o var.c: add :Or for reverse sort. 2020-05-24 Simon J Gerraty * configure.in: add AC_PROG_CC_C99 for mipspro compiler also if --with-filemon= specifies path to filemon.h set use_filemon=dev * dirname.c: remove include of namespace.h 2020-05-17 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200517 Merge with NetBSD make, pick up o modified dollar tests to avoid shell dependencies o new tests for .INCLUDEFROM 2020-05-16 Simon J Gerraty * unit-tests/dollar.mk: tweak '1 dollar literal' test to not depend so much on shell behavior 2020-05-10 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200510 Merge with NetBSD make, pick up o unit test for dollar handling 2020-05-06 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200506 Merge with NetBSD make, pick up o str.c: empty string does not match % pattern plus unit-test changes 2020-05-04 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200504 May the 4th be with you Merge with NetBSD make, pick up o var.c: import handling of old sysV style modifier using '%' o str.c: refactor brk_string o unit-tests: add test case for lazy conditions 2020-04-18 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200418 * configure.in: use_makefile=no for cygwin et al. case insensitive filesystems just don't work if both makefile and Makefile exist. NOTE: bmake does not support cygwin and likely never will, but if brave souls want to try it - help them out. 2020-04-02 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200402 Merge with NetBSD make, pick up o meta.c: meta_oodate, CHECK_VALID_META is too aggressive for CMD a blank command is perfectly valid. 2020-03-30 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200330 Merge with NetBSD make, pick up o make.h: extern debug_file 2020-03-18 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200318 Merge with NetBSD make, pick up o meta.c: meta_oodate, check for corrupted meta file earlier and more often. 2020-02-20 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200220 2020-02-19 Simon J Gerraty * boot-strap: unset MAKEFLAGS 2020-02-12 Simon J Gerraty * VERSION (_MAKE_VERSION): 20200212 * meta.c: meta_compat_parent check for USE_FILEMON patch from Soeren Tempel 2020-02-05 Simon J Gerraty * VERSION: 20200205 Merge with NetBSD make, pick up o meta.c: fix compat mode, need to call meta_job_output() o job.c: extra fds for meta mode not needed if using filemon_dev 2020-01-22 Simon J Gerraty * VERSION: 20200122 Merge with NetBSD make, pick up o meta.c: avoid passing NULL to filemon_*() when meta_needed() returns FALSE. 2020-01-21 Simon J Gerraty * VERSION: 20200121 Merge with NetBSD make, pick up o filemon/filemon_{dev,ktrace}.c: allow selection of filemon implementation. filemon_dev.c uses the kernel module while filemon_ktrace.c leverages the fktrace api available in NetBSD. filemon_ktrace.c can hopefully form the basis for adding support for other tracing mechanisms such as strace on Linux. o meta.c: when target is out-of-date per normal make rules record value of .OODATE in meta file. 2019-09-26 Simon J Gerraty * VERSION: 20190926 Merge with NetBSD make, pick up o parse.c: don't pass NULL to realpath(3) some versions cannot handle it. 2019-04-09 Simon J Gerraty * VERSION: 20190409 Merge with NetBSD make, pick up o parse.c: ParseDoDependency: free paths rather than assert 2018-12-22 Simon J Gerraty * VERSION: 20181222 * configure.in: add --without-makefile to avoid generating makefile and make-bootstrap.sh * include Makefile.inc if it exists * Use Makefile and Makefile.config.in in unit-tests so we can use just: make obj && make && make test when bmake is already available. We add --without-makefile to CONFIGURE_ARGS in this case. * tweak bsd.after-import.mk (captures Makefile.config etc after import to FreeBSD for example) to cope with all the above. 2018-12-21 Simon J Gerraty * VERSION: 20181221 Merge with NetBSD make, pick up o parse.c: ParseVErrorInternal use .PARSEDIR and apply if relative, and then use .PARSEFILE for consistent result. 2018-12-20 Simon J Gerraty * VERSION: 20181220 Merge with NetBSD make, pick up o parse.c: ParseVErrorInternal use .CURDIR if .PARSEDIR is relative o var.c: avoid SEGFAULT in .unexport-env when MAKELEVEL is not set 2018-12-16 Simon J Gerraty * VERSION: 20181216 Merge with NetBSD make, pick up o fix for unit-tests/varquote.mk on Debian 2018-09-21 Simon J. Gerraty * VERSION: 20180919 Merge with NetBSD make, pick up o var.c: add :q o dir.c: cleanup caching of stats 2018-09-21 Simon J Gerraty * Makefile.config.in: use += where it makes sense. 2018-05-12 Simon J. Gerraty * VERSION: 20180512 Merge with NetBSD make, pick up o job.c: skip polling job token pipe 2018-04-05 Simon J. Gerraty * VERSION: 20180405 Merge with NetBSD make, pick up o parse.c: be more cautious about detecting depenency line rather than sysV style include. 2018-02-22 Simon J. Gerraty * VERSION: 20180222 Merge with NetBSD make, pick up o parse.c: avoid calling sysconf for every call to loadfile 2018-02-18 Simon J. Gerraty * VERSION: 20180218 Merge with NetBSD make, pick up o var.c: Var_Set handle NULL value anytime. 2018-02-12 Simon J. Gerraty * VERSION: 20180212 Merge with NetBSD make, pick up o parse.c: do not treat .info as warning with -W 2017-12-07 Simon J. Gerraty * VERSION: 20171207 Merge with NetBSD make, pick up o var.c: Var_Append use Var_Set if var not previously set so that VAR_CMD is handled correctly. Add a suitable unit-test. 2017-11-26 Simon J. Gerraty * VERSION (_MAKE_VERSION): 20171126 * aclocal.m4: use AC_LINK_IFELSE for AC_C___ATTRIBUTE__ since AC_TRY_COMPILE puts input inside main() which upsets modern compilers. 2017-11-18 Simon J. Gerraty * VERSION: 20171118 Merge with NetBSD make, pick up o var.c: do not append to variable set on command line add unit-test to catch this. 2017-10-28 Simon J. Gerraty * VERSION: 20171028 Merge with NetBSD make, pick up o main.c: ignore empty MAKEOBJDIR * Makefile.config.in: make @prefix@ @machine*@ and @default_sys_path@ defaults. 2017-10-05 Simon J. Gerraty * VERSION: 20171005 * unit-tests/dotwait.mk: redirect stderr through pipe for more consistent result on some platforms. 2017-08-13 Simon J. Gerraty * machine.sh: entry for AIX 2017-08-12 Simon J. Gerraty * VERSION (_MAKE_VERSION): Move the setting of _MAKE_VERSION to a file that can be included by configure as well as make. This allows configure to set set _MAKE_VERSION in make-bootstrap.sh 2017-08-10 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170810 Merge with NetBSD make, pick up o meta.c: if target is in subdir we only need subdir name in meta_name. 2017-07-20 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170720 Merge with NetBSD make, pick up o compat.c: pass SIGINT etc onto child and wait for it to exit before we self-terminate. 2017-07-11 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170711 forgot to update after merge on 20170708 ;-) o main.c: refactor to reduce size of main function. add -v option to always fully expand values. o meta.c: ensure command output in meta file has ending newline even when filemon not being used. When matching ${.MAKE.META.IGNORE_PATTERNS} do not use pathname via ':L' since any ':' in pathname breaks that. Instead set a '${.p.}' to pathname in the target context and use that. 2017-05-10 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170510 Merge with NetBSD make, pick up o main.c: Main_SetObjdir: ensure buf2 is in scope 2017-05-08 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170505 see mk/ChangeLog 2017-05-05 Simon J. Gerraty * parse.c: not everyone has stdint.h 2017-05-01 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170501 see mk/ChangeLog 2017-04-21 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170421 Merge with NetBSD make, pick up o str.c: Str_Match: fix closure tests for [^] and add unit-test. 2017-04-20 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170420 Merge with NetBSD make, pick up o main.c: only use -C arg "as is" if it contains no relative component. 2017-04-18 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170418 Merge with NetBSD make, pick up o main.c: fix Main_SetObjdir() for relative paths (eg obj). 2017-04-17 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170417 Merge with NetBSD make, pick up o fixes a number of coverity complaints - check return value of fseek, fcntl - plug memory leak in Dir_FindFile, Var_LoopExpand, JobPrintCommand, ParseTraditionalInclude - use bmake_malloc() where NULL is not tollerated - use MAKE_ATTR_UNUSED rather that kludges like return(unused ? 0 : 0) - use purge_cached_realpaths() rather than abuse cached_realpath() 2017-04-13 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170413 Merge with NetBSD make, pick up o main.c: when setting .OBJDIR ignore '$' in paths. * job.c: use MALLOC_OPTIONS to set malloc_options. 2017-04-11 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170411 Merge with NetBSD make, pick up o str.c: Str_Match: allow [^a-z] to behave as expected. 2017-03-26 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170326 Merge with NetBSD make, pick up o main.c: purge relative paths from realpath cache when .OBJDIR is changed. 2017-03-11 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170311 Merge with NetBSD make, pick up o main.c: only use -C arg "as is" if it starts with '/'. 2017-03-01 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170301 Merge with NetBSD make, pick up o main.c: use -C arg "as is" rather than getcwd() if they identify the same directory. o parse.c: ensure loadfile buffer is \n terminated in non-mmap case 2017-02-01 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170201 Merge with NetBSD make, pick up o var.c: allow :_=var and avoid use of special context. 2017-01-30 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170130 Merge with NetBSD make, pick up o var.c: add :range and :_ o main.c: partially initialize Dir_* before MainParseArgs() can be called. If -V, skip Main_ExportMAKEFLAGS() 2017-01-14 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20170114 Merge with NetBSD make, pick up o var.c: allow specifying the utc value used by :{gm,local}time 2016-12-12 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20161212 Merge with NetBSD make, pick up o main.c: look for obj.${MACHINE}-${MACHINE_ARCH} too. 2016-12-09 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20161209 Merge with NetBSD make, pick up o main.c: cleanup setting of .OBJDIR o parse.c: avoid coredump from (var)=val 2016-11-26 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20161126 Merge with NetBSD make, pick up o make.c: Make_OODate: report src node name if path not set 2016-09-26 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160926 Merge with NetBSD make, pick up o support for .DELETE_ON_ERROR: (remove targets that fail) 2016-09-26 Simon J. Gerraty * Makefile MAN: tweak .Dt to match ${PROG} 2016-08-18 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160818 its a neater number; pick up whitespace fixes to man page. 2016-08-17 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160817 Merge with NetBSD make, pick up o meta.c: move handling of .MAKE.META.IGNORE_* to meta_ignore() so we can call it before adding entries to missingFiles. Thus we do not track files we have been told to ignore. 2016-08-15 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160815 Merge with NetBSD make, pick up o meta_oodate: apply .MAKE.META.IGNORE_FILTER (if defined) to pathnames, and skip if the expansion is empty. Useful for dirdeps.mk when checking DIRDEPS_CACHE. 2016-08-12 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160812 Merge with NetBSD make, pick up o meta.c: remove all missingFiles entries that match a deleted dir. o main.c: set .ERROR_CMD if possible. 2016-06-06 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160606 Merge with NetBSD make, pick up o dir.c: extend mtimes cache to others via cached_stat() 2016-06-04 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160604 Merge with NetBSD make, pick up o meta.c: missing filemon data is only relevant if we read a meta file. Also do not return oodate for a missing metafile if gn->path points to .CURDIR 2016-06-02 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160602 Merge with NetBSD make, pick up o cached_realpath(): avoid hitting filesystem more than necessary. o meta.c: refactor need_meta decision, add knobs for missing meta file and filemon data wrt out-of-datedness. 2016-05-28 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160528 * boot-strap, make-bootstrap.sh.in: Makefile now uses _MAKE_VERSION 2016-05-12 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160512 Merge with NetBSD make, pick up o meta.c: ignore paths that match .MAKE.META.IGNORE_PATTERNS this is useful for gcov builds. o propagate errors from filemon(4). 2016-05-09 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160509 Merge with NetBSD make, pick up o remove use of non-standard types u_int etc. o meta.c: apply realpath() before matching against metaIgnorePaths 2016-04-04 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160404 Merge with NetBSD make, pick up o allow makefile to set .MAKE.JOBS * Makefile (PROG_NAME): use ${_MAKE_VERSION} 2016-03-15 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160315 Merge with NetBSD make, pick up o fix handling of archive members 2016-03-13 Simon J. Gerraty * Makefile (_MAKE_VERSION): rename variable to avoid interference with checks for ${MAKE_VERSION} 2016-03-10 Simon J. Gerraty * Makefile (MAKE_VERSION): 20160310 Merge with NetBSD make, pick up o meta.c: treat missing Read file same as Write, incase we Delete it. 2016-03-07 Simon J. Gerraty * Makefile (MAKE_VERSION): 20160307 Merge with NetBSD make, pick up o var.c: fix :ts\nnn to be octal by default. o meta.c: meta_finish() to cleanup memory. 2016-02-26 Simon J. Gerraty * Makefile (MAKE_VERSION): 20160226 Merge with NetBSD make, pick up o meta.c: allow meta file for makeDepend if makefiles want it. 2016-02-19 Simon J. Gerraty * var.c: default .MAKE.SAVE_DOLLARS to FALSE for backwards compatability. * Makefile (MAKE_VERSION): 20160220 Merge with NetBSD make, pick up o var.c: add knob to control handling of '$$' in := 2016-02-18 Simon J. Gerraty * Makefile (MAKE_VERSION): 20160218 Merge with NetBSD make, pick up o var.c: add .export-literal allows us to fix sys.clean-env.mk post the changes to Var_Subst. Var_Subst now takes flags, and does not consume '$$' in := 2016-02-17 Simon J. Gerraty * Makefile (MAKE_VERSION): 20160217 Merge with NetBSD make, pick up o var.c: preserve '$$' in := o parse.c: add .dinclude for handling included makefile like .depend 2015-12-20 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151220 Merge with NetBSD make, pick up o suff.c: re-initialize suffNull when clearing suffixes. 2015-12-01 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151201 Merge with NetBSD make, pick up o cond.c: CondCvtArg: avoid access beyond end of empty buffer. o meta.c: meta_oodate: use lstat(2) for checking link target in case it is a symlink. o var.c: avoid calling brk_string and Var_Export1 with empty strings. 2015-11-26 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151126 Merge with NetBSD make, pick up o parse.c: ParseTrackInput don't access beyond end of old value. 2015-10-22 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151022 * Add support for BSD/OS which lacks inttypes.h and really needs sys/param.h for sys/sysctl.h also 'type' is not a shell builtin. * var.c: eliminate uint32_t and need for inttypes.h * main.c: PrintOnError flush stdout before run .ERROR * parse.c: cope with _SC_PAGESIZE not being defined. 2015-10-20 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151020 Merge with NetBSD make, pick up o var.c: fix uninitialized var 2015-10-12 Simon J. Gerraty * var.c: the conditional expressions used with ':?' can be expensive, if already discarding do not evaluate or expand anything. 2015-10-10 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151010 Merge with NetBSD make, pick up o Add Boolean wantit flag to Var_Subst and Var_Parse when FALSE we know we are discarding the result and can skip operations like Cmd_Exec. 2015-10-09 Simon J. Gerraty * Makefile (MAKE_VERSION): 20151009 Merge with NetBSD make, pick up o var.c: don't check for NULL before free() o meta.c: meta_oodate, do not hard code ignore of makeDependfile 2015-09-10 Simon J. Gerraty * Makefile (MAKE_VERSION): 20150910 Merge with NetBSD make, pick up o main.c: with -w print Enter/Leaving messages for objdir too if necessary. o centralize shell metachar handling * FILES: add metachar.[ch] 2015-06-06 Simon J. Gerraty * Makefile (MAKE_VERSION): 20150606 Merge with NetBSD make, pick up o make.1: document .OBJDIR target 2015-05-05 Simon J. Gerraty * Makefile (MAKE_VERSION): 20150505 Merge with NetBSD make, pick up o cond.c: be strict about lhs of comparison when evaluating .if but less so when called from variable expansion. o unit-tests/cond2.mk: test various error conditions 2015-05-04 Simon J. Gerraty * machine.sh (MACHINE): Add Bitrig patch from joerg@netbsd.org 2015-04-18 Simon J. Gerraty * Makefile (MAKE_VERSION): 20150418 Merge with NetBSD make, pick up o job.c: use memmove() rather than memcpy() * unit-tests/varshell.mk: SunOS cannot handle the TERMINATED_BY_SIGNAL case, so skip it. 2015-04-11 Simon J. Gerraty * Makefile (MAKE_VERSION): 20150411 bump version - only mk/ changes. 2015-04-10 Simon J. Gerraty * Makefile (MAKE_VERSION): 20150410 Merge with NetBSD make, pick up o document different handling of '-' in jobs mode vs compat o fix jobs mode so that '-' only applies to whole job when shell lacks hasErrCtl o meta.c: use separate vars to track lcwd and latestdir (read) per process 2015-04-01 Simon J. Gerraty * Makefile (MAKE_VERSION): 20150401 Merge with NetBSD make, pick up o meta.c: close meta file in child * Makefile: use BINDIR.bmake if set. Same for MANDIR and SHAREDIR Handy for testing release candidates in various environments. 2015-03-26 Simon J. Gerraty * move initialization of savederr to block where it is used to avoid spurious warning from gcc5 2014-11-11 Simon J. Gerraty * Makefile (MAKE_VERSION): 20141111 just a cooler number 2014-11-05 Simon J. Gerraty * Makefile (MAKE_VERSION): 20141105 Merge with NetBSD make, pick up o revert major overhaul of suffix handling and POSIX compliance - too much breakage and impossible to make backwards compatible. o we still have the new unit test structure which is ok. o meta.c ensure "-- filemon" is at start of line. 2014-09-17 Simon J. Gerraty * configure.in: test that result of getconf PATH_MAX is numeric and discard if not. Apparently needed for Hurd. 2014-08-30 Simon J. Gerraty * Makefile (MAKE_VERSION): 20140830 Merge with NetBSD make, pick up o major overhaul of suffix handling o improved POSIX compliance o overhauled unit-tests 2014-06-20 Simon J. Gerraty * Makefile (MAKE_VERSION): 20140620 Merge with NetBSD make, pick up o var.c return varNoError rather than var_Error for ::= modifiers. 2014-05-22 Simon J. Gerraty * Makefile (MAKE_VERSION): 20140522 Merge with NetBSD make, pick up o var.c detect some parse errors. 2014-04-05 Simon J. Gerraty * Fix spelling errors - patch from Pedro Giffuni 2014-02-14 Simon J. Gerraty * Makefile (MAKE_VERSION): 20140214 Merge with NetBSD make, pick up o .INCLUDEFROM* o use Var_Value to get MAKEOBJDIR[PREFIX] o reduced realloc'ign in brk_string. * configure.in: add a check for compiler supporting __func__ 2014-01-03 Simon J. Gerraty * boot-strap: ignore mksrc=none 2014-01-02 Simon J. Gerraty * Makefile (DEFAULT_SYS_PATH?): use just ${prefix}/share/mk 2014-01-01 Simon J. Gerraty * Makefile (MAKE_VERSION): 20140101 * configure.in: set bmake_path_max to min(_SC_PATH_MAX,1024) * Makefile.config: defined BMAKE_PATH_MAX to bmake_path_max * make.h: use BMAKE_PATH_MAX if MAXPATHLEN not defined (needed for Hurd) * configure.in: Add AC_PREREQ and check for sysctl; patch from Andrew Shadura andrewsh at debian.org 2013-10-16 Simon J. Gerraty * Makefile (MAKE_VERSION): 20131010 * lose the const from arg to systcl to avoid problems on older BSDs. 2013-10-01 Simon J. Gerraty * Makefile (MAKE_VERSION): 20131001 Merge with NetBSD make, pick up o main.c: for NATIVE build sysctl to get MACHINE_ARCH from hw.machine_arch if necessary. o meta.c: meta_oodate - need to look at src of Link and target of Move as well. * main.c: check that CTL_HW and HW_MACHINE_ARCH exist. provide __arraycount() if needed. 2013-09-04 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130904 Merge with NetBSD make, pick up o Add VAR_INTERNAL context, so that internal setting of MAKEFILE does not override value set by makefiles. 2013-09-02 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130902 Merge with NetBSD make, pick up o CompatRunCommand: only apply shellErrFlag when errCheck is true 2013-08-28 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130828 Merge with NetBSD make, pick up o Fix VAR :sh = syntax from Will Andrews at freebsd.org o Call Job_SetPrefix() from Job_Init() so makefiles have opportunity to set .MAKE.JOB.PREFIX 2013-07-30 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130730 Merge with NetBSD make, pick up o Allow suppression of --- job -- tokens by setting .MAKE.JOB.PREFIX empty. 2013-07-16 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130716 Merge with NetBSD make, pick up o number of gmake compatibility tweaks -w for gmake style entering/leaving messages if .MAKE.LEVEL > 0 indicate it in progname "make[1]" etc. handle MAKEFLAGS containing only letters. o when overriding a GLOBAL variable on the command line, delete it from GLOBAL context so -V doesn't show the wrong value. 2013-07-06 Simon J. Gerraty * configure.in: We don't need MAKE_LEVEL_SAFE anymore. * Makefile (MAKE_VERSION): 20130706 Merge with NetBSD make, pick up o Shell_Init(): export shellErrFlag if commandShell hasErrCtl is true so that CompatRunCommand() can use it, to ensure consistent behavior with jobs mode. o use MAKE_LEVEL_ENV to define the variable to propagate .MAKE.LEVEL - currently set to MAKELEVEL (same as gmake). o meta.c: use .MAKE.META.IGNORE_PATHS to allow customization of paths to ignore. 2013-06-04 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130604 Merge with NetBSD make, pick up o job.c: JobCreatePipe: do fcntl() after any tweaking of fd's to avoid leaking descriptors. 2013-05-28 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130528 Merge with NetBSD make, pick up o var.c: cleanup some left-overs in VarHash() 2013-05-20 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130520 generate manifest from component FILES rather than have to update FILES when mk/FILES changes. 2013-05-18 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130518 Merge with NetBSD make, pick up o suff.c: don't skip all processsing for .PHONY targets else wildcard srcs do not get expanded. o var.c: expand name of variable to delete if necessary. 2013-03-30 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130330 Merge with NetBSD make, pick up o meta.c: refine the handling of .OODATE in commands. Rather than suppress command comparison for the entire script as though .NOMETA_CMP had been used, only suppress it for the one command line. This allows something like ${.OODATE:M.NOMETA_CMP} to be used to suppress comparison of a command without otherwise affecting it. o make.1: document that 2013-03-22 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130321 yes, not quite right but its a cooler number. Merge with NetBSD make, pick up o parse.c: fix ParseGmakeExport to be portable and add a unit-test. * meta.c: call meta_init() before makefiles are read and if built with filemon support set .MAKE.PATH_FILEMON to _PATH_FILEMON this let's makefiles test for support. Call meta_mode_init() to process .MAKE.MODE. 2013-03-13 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130305 Merge with NetBSD make, pick up o run .STALE: target when a dependency from .depend is missing. o job.c: add Job_RunTarget() for the above and .BEGIN 2013-03-03 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130303 Merge with NetBSD make, pick up o main.c: set .MAKE.OS to utsname.sysname o job.c: more checks for read and poll errors o var.c: lose VarChangeCase() saves 4% time 2013-03-02 Simon J. Gerraty * boot-strap: remove MAKEOBJDIRPREFIX from environment since we want to use MAKEOBJDIR 2013-01-27 Simon J. Gerraty * Merge with NetBSD make, pick up o make.1: more info on how shell commands are handled. o job.c,main.c: detect write errors to job pipes. 2013-01-25 Simon J. Gerraty * Makefile (MAKE_VERSION): 20130123 Merge with NetBSD make, pick up o meta.c: if script uses .OODATE and meta_oodate() decides rebuild is needed, .OODATE will be empty - set it to .ALLSRC. o var.c: in debug output indicate which variabale modifiers apply to. o remove Check_Cwd logic the makefiles have been fixed. 2012-12-12 Simon J. Gerraty * makefile.in: add a simple makefile for folk who insist on ./configure; make; make install it just runs boot-strap * include mk/* to accommodate the above * boot-strap: re-work to accommodate the above mksrc defaults to $Mydir/mk allow op={configure,build,install,clean,all} add options to facilitate install * Makefile.config.in: just the bits set by configure * Makefile: bump version to 20121212 abandon Makefile.in (NetBSD Makefile) leverage mk/* instead * configure.in: ensure srcdir is absolute 2012-11-11 Simon J. Gerraty * Makefile.in (MAKE_VERSION): 20121111 fix generation of bmake.cat1 2012-11-09 Simon J. Gerraty * Makefile.in (MAKE_VERSION): 20121109 Merge with NetBSD make, pick up o make.c: MakeBuildChild: return 0 so search continues if a .ORDER dependency is detected. o unit-tests/order: test the above 2012-11-02 Simon J. Gerraty * Makefile.in (MAKE_VERSION): 20121102 Merge with NetBSD make, pick up o cond.c: allow cond_state[] to grow. In meta mode with a very large tree, we can hit the limit while processing dirdeps. 2012-10-25 Simon J. Gerraty * Makefile.in: we need to use ${srcdir} not ${.CURDIR} 2012-10-10 Simon J. Gerraty * Makefile.in (MAKE_VERSION): 20121010 o protect syntax that only bmake parses correctly. o remove auto setting of FORCE_MACHINE, use configure's --with-force-machine=whatever if that is desired. 2012-10-08 Simon J. Gerraty * Makefile.in: do not lose history from make.1 when generating bmake.1 2012-10-07 Simon J. Gerraty * Makefile.in (MAKE_VERSION): 20121007 Merge with NetBSD make, pick up o compat.c: ignore empty commands - same as jobs mode. o make.1: document meta chars that cause use of shell 2012-09-11 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120911 * bsd.after-import.mk: include Makefile.inc early and allow it to override PROG 2012-08-31 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120831 Merge with NetBSD make, pick up o cast sizeof() to int for comparison o minor make.1 tweak 2012-08-30 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120830 Merge with NetBSD make, pick up o .MAKE.EXPAND_VARIABLES knob can control default behavior of -V o debug flag -dV causes -V to show raw value regardless. 2012-07-05 Simon J. Gerraty * bsd.after-import.mk (after-import): ensure unit-tests/Makefile gets SRCTOP set. 2012-07-04 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120704 Merge with NetBSD make, pick up o Job_ParseShell should call Shell_Init if it has been previously called. * Makefile.in: set USE_META based on configure result. also .PARSEDIR is safer indicator of bmake. 2012-06-26 Simon J. Gerraty * Makefile.in: bump version to 20120626 ensure CPPFLAGS is in CFLAGS * meta.c: avoid nested externs * bsd.after-import.mk: avoid ${.CURDIR}/Makefile as target 2012-06-20 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120620 Merge with NetBSD make, pick up o make_malloc.c: avoid including make_malloc.h again * Makefile.in: avoid bmake only syntax or protect with .if defined(.MAKE.LEVEL) * bsd.after-import.mk: replace .-include with .sinclude ensure? SRCTOP gets a value * configure.in: look for filemon.h in /usr/include/dev/filemon first. 2012-06-19 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120612 Merge with NetBSD make, pick up o use MAKE_ATTR_* rather than those defined by cdefs.h or compiler for greater portability. o unit-tests/forloop: check that .for works as expected wrt number of times and with "quoted strings". 2012-06-06 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120606 Merge with NetBSD make, pick up o compat.c: use kill(2) rather than raise(3). * configure.in: look for sys/dev/filemon * bsd.after-import.mk: add a .-include "Makefile.inc" to Makefile and pass BOOTSTRAP_XTRAS to boot-strap. 2012-06-04 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120604 Merge with NetBSD make, pick up o util.c and var.c share same var for tracking if environ has been reallocated. o util.c provide getenv with setenv. * Add MAKE_LEVEL_SAFE as an alternate means of passing MAKE_LEVEL when the shell actively strips .MAKE.* from the environment. We still refer to the variable always as .MAKE.LEVEL * util.c fix bug in findenv() was finding prefix of name. * compat.c: re-raising SIGINT etc after running .INTERRUPT results in more reliable termination of all activity on many platforms. 2012-06-02 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120602 Merge with NetBSD make, pick up o for.c: handle quoted items in .for list 2012-05-30 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120530 Merge with NetBSD make, pick up o compat.c: ignore empty command. 2012-05-24 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120524 * FILES: add bsd.after-import.mk: A simple means of integrating bmake into a BSD build system. 2012-05-20 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120520 Merge with NetBSD make, pick up o increased limit for nested conditionals. 2012-05-18 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120518 Merge with NetBSD make, pick up o use _exit(2) in signal hanlder o Don't use the [dir] cache when building nodes that might have changed since the last exec. o Avoid nested extern declaration warnings. 2012-04-27 Simon J. Gerraty * meta.c (fgetLine): avoid %z - not portable. * parse.c: Since we moved include of sys/mman.h and def's of MAP_COPY etc. we got dups from a merge. 2012-04-24 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120420 Merge with NetBSD make, pick up o restore duplicate supression in .MAKE.MAKEFILES runtime saving can be significant. o Var_Subst() uses Buf_DestroyCompact() to reduce memory consumption up to 20%. 2012-04-20 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120420 Merge with NetBSD make, pick up o remove duplicate supression in .MAKE.MAKEFILES o improved dir cache behavior o gmake'ish export command 2012-03-25 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20120325 Merge with NetBSD make, pick up o fix parsing of :[#] in conditionals. 2012-02-10 Simon J. Gerraty * Makefile.in: replace use of .Nx in bmake.1 with NetBSD since some systems cannot cope with .Nx 2011-11-14 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20111111 Merge with NetBSD make, pick up o debug output for .PARSEDIR and .PARSEFILE 2011-10-10 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20111010 2011-10-09 Simon J. Gerraty * boot-strap: check for an expected file in the dirs we look for. * make-bootstrap.sh: pass on LDSTATIC 2011-10-01 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20111001 Merge with NetBSD make, pick up o ensure .PREFIX is set for .PHONY and .TARGET set for .PHONY run via .END o __dead used consistently 2011-09-10 Simon J. Gerraty * Makefile.in (MAKE_VERSION): 20110909 is a better number ;-) 2011-09-05 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110905 Merge with NetBSD make, pick up o meta_oodate: ignore makeDependfile 2011-08-28 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110828 Merge with NetBSD make, pick up o silent=yes in .MAKE.MODE causes meta mode to mark targets as SILENT if a .meta file is created 2011-08-18 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110818 Merge with NetBSD make, pick up o in meta mode, if target flagged .META a missing .meta file means target is out-of-date o fixes for gcc 4.5 warnings o simplify job printing code 2011-08-09 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110808 Merge with NetBSD make, pick up o do not touch OP_SPECIAL targets when doing make -t 2011-06-22 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110622 Merge with NetBSD make, pick up o meta_oodate detect corrupted .meta file and declare oodate. * configure.in: add check for setsid 2011-06-07 Simon J. Gerraty * Merge with NetBSD make, pick up o unit-tests/modts now works on MirBSD 2011-06-04 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110606 Merge with NetBSD make, pick up o ApplyModifiers: when we parse a variable which is not the entire modifier string, or not followed by ':', do not consider it as containing modifiers. o loadfile: ensure newline at end of mapped file. 2011-05-05 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110505 Merge with NetBSD make, pick up o .MAKE.META.BAILIWICK - list of prefixes which define the scope of make's control. In meta mode, any generated file within said bailiwick, which is found to be missing, causes current target to be out-of-date. 2011-04-11 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110411 Merge with NetBSD make, pick up o when long modifiers fail to match, check sysV style. - add a test case 2011-04-10 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110410 Merge with NetBSD make, pick up o :hash - cheap 32bit hash of value o :localtime, :gmtime - use value as format string for strftime. 2011-03-30 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110330 mostly because its a cooler version. Merge with NetBSD make, pick up o NetBSD tags for meta.[ch] o job.c call meta_job_finish() after meta_job_error(). o meta_job_error() should call meta_job_finish() to ensure .meta file is closed, and safe to copy - if .ERROR target wants. meta_job_finish() is safe to call repeatedly. 2011-03-29 Simon J. Gerraty * unit-tests/modts: use printf if it is a builtin, to save us from MirBSD * Makefile.in (MAKE_VERSION): bump version to 20110329 Merge with NetBSD make, pick up o fix for use after free() in CondDoExists(). o meta_oodate() report extra commands and return earlier. 2011-03-27 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110327 Merge with NetBSD make, pick up o meta.c, if .MAKE.MODE contains curdirOk=yes allow creating .meta files in .CURDIR * boot-strap (TOOL_DIFF): aparently at least on linux distro formats the output of 'type' differently - so eat any "()" 2011-03-06 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110306 Merge with NetBSD make, pick up o meta.c, only do getcwd() once 2011-03-05 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110305 Merge with NetBSD make, pick up o correct sysV substitution handling of empty lhs and variable o correct exists() check for dir with trailing / o correct handling of modifiers for non-existant variables during evaluation of conditionals. o ensure MAP_FILE is defined. o meta.c use curdir[] now exported by main.c 2011-02-25 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110225 Merge with NetBSD make, pick up o fix for incorrect .PARSEDIR when .OBJDIR is re-computed after makefiles have been read. o fix example of :? modifier in man page. 2011-02-13 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110214 Merge with NetBSD make, pick up o meta.c handle realpath() failing when generating meta file name. * sigcompat.c: convert to ansi so we can use higher warning levels. 2011-02-07 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110207 Merge with NetBSD make, pick up o fix for bug in meta mode. 2011-01-03 Simon J. Gerraty * parse.c: SunOS 5.8 at least does not have MAP_FILE 2011-01-01 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20110101 Merge with NetBSD make, pick up o use mmap(2) if available, for reading makefiles 2010-12-15 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20101215 Merge with NetBSD make, pick up o ensure meta_job_error() does not report a previous .meta file as being culprit. 2010-12-10 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20101210 Merge with NetBSD make, pick up o meta_oodate: track cwd per process, and only consider target out-of-date if missing file is outside make's CWD. Ignore files in /tmp/ etc. o to ensure unit-tests results match, need to control LC_ALL as well as LANG. o fix for parsing bug in var.c 2010-11-26 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20101126 Merge with NetBSD make, pick up o if stale dependency is an IMPSRC, search via .PATH o meta_oodate: if a referenced file is missing, target is out-of-date. o meta_oodate: if a target uses .OODATE in its commands, it (.OODATE) needs to be recomputed. o keep a pointer to youngest child node, rather than just its mtime. 2010-11-02 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20101101 2010-10-16 Simon J. Gerraty * machine.sh: like os.sh, allow for uname -p producing useless drivel 2010-09-13 Simon J. Gerraty * boot-strap: document configure knobs for meta and filemon. * Makefile.in (MAKE_VERSION): bump version to 20100911 Merge with NetBSD make, pick up o meta.c - meta mode * make-bootstrap.sh.in: handle meta.c * configure.in: add knobs for use_meta and filemon_h also, look for dirname, str[e]sep and strlcpy * util.c: add simple err[x] and warn[x] 2010-08-08 Simon J. Gerraty * boot-strap (TOOL_DIFF): set this to ensure tests use the same version of diff that configure tested * Makefile.in (MAKE_VERSION): bump version to 20100808 Merge with NetBSD make, pick up o in jobs mode, when we discover we cannot make something, call PrintOnError before exit. 2010-08-06 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100806 Merge with NetBSD make, pick up o formatting fixes for ignored errors o ensure jobs are cleaned up regardless of where wait() was called. 2010-06-28 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100618 * os.sh (MACHINE_ARCH): watch out for drivel from uname -p 2010-06-16 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100616 Merge with NetBSD make, pick up o man page update o call PrintOnError from JobFinish when we detect an error we are not ignoring. 2010-06-06 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100606 Merge with NetBSD make, pick up o man page update 2010-06-05 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100605 Merge with NetBSD make, pick up o use bmake_signal() which is a wrapper around sigaction() in place of signal() o add .export-env to allow exporting variables to environment without tracking (so no re-export when the internal value is changed). 2010-05-24 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100524 Merge with NetBSD make, pick up o fix for .info et al being greedy. 2010-05-23 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100520 Merge with NetBSD make, pick up o back to using realpath on argv[0] but only if contains '/' and does not start with '/'. 2010-05-10 Simon J. Gerraty * boot-strap: use absolute path for bmake when running tests. * Makefile.in (MAKE_VERSION): bump version to 20100510 Merge with NetBSD make, pick up o revert use of realpath on argv[0] too many corner cases. o print MAKE_PRINT_VAR_ON_ERROR before running .ERROR target. 2010-05-05 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100505 Merge with NetBSD make, pick up o fix for missed SIGCHLD when compiled with SunPRO actually for bmake, defining FORCE_POSIX_SIGNALS would have done the job. 2010-04-30 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100430 Merge with NetBSD make, pick up o fflush stdout before writing to stdout 2010-04-23 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100423 Merge with NetBSD make, pick up o updated unit tests for Haiku (this time for sure). * boot-strap: based on patch from joerg honor --with-default-sys-path better. * boot-strap: remove mention of --with-prefix-sys-path 2010-04-22 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100422 * Merge with NetBSD make, pick up o fix for vfork() on Darwin. o fix for bogus $TMPDIR. o set .MAKE.MODE=compat for -B o set .MAKE.JOBS=max_jobs for -j max_jobs o allow unit-tests to run without any *.mk o unit-tests/modmisc be more conservative in dirs presumed to exist. * boot-strap: ignore /usr/share/mk except on NetBSD. * unit-tests/Makefile.in: set LANG=C when running unit-tests to ensure sort(1) behaves as expected. 2010-04-21 Simon J. Gerraty * boot-strap: add FindHereOrAbove so we can use -m .../mk 2010-04-20 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100420 * Merge with NetBSD make, pick up o fix for variable realpath() behavior. we have to stat(2) the result to be sure. o fix for .export (all) when nested vars use :sh 2010-04-14 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100414 * Merge with NetBSD make, pick up o use realpath to resolve argv[0] (for .MAKE) if needed. o add realpath from libc. o add :tA to resolve variable via realpath(3) if possible. 2010-04-08 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100408 * Merge with NetBSD make, pick up o unit tests for .ERROR, .error o fix for .ERROR to ensure it cannot be default target. 2010-04-06 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100406 * Merge with NetBSD make, pick up o fix for compat mode "Error code" going to debug_file. o fix for .ALLSRC being populated twice. o support for .info, .warning and .error directives o .MAKE.MODE to control make's operational mode o .MAKE.MAKEFILE_PREFERENCE to control the preferred makefile name(s). o .MAKE.DEPENDFILE to control the name of the depend file o .ERROR target - run on failure. 2010-03-18 Simon J. Gerraty * make-bootstrap.sh.in: extract MAKE_VERSION from Makefile * os.sh,arch.c: patch for Haiku from joerg at netbsd 2010-03-17 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100222 * Merge with NetBSD make, pick up o better error msg for .for with mutiple inter vars * boot-strap: o use make-bootstrap.sh from joerg at netbsd to avoid the need for a native make when bootstrapping. o add "" everywhere ;-) o if /usr/share/tmac/andoc.tmac exists install nroff bmake.1 otherwise the pre-formated version. 2010-01-04 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20100102 * Merge with NetBSD make, pick up: o fix for -m .../ 2009-11-18 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20091118 * Merge with NetBSD make, pick up: o .unexport o report lines that start with '.' and should have ':' (catch typo's of .el*if). 2009-10-30 Simon J. Gerraty * configure.in: Ensure that srcdir and mksrc are absolute paths. 2009-10-09 Simon J. Gerraty * Makefile.in (MAKE_VERSION): fix version to 20091007 2009-10-07 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 200910007 * Merge with NetBSD make, pick up: o fix for parsing of :S;...;...; applied to .for loop iterator appearing in a dependency line. 2009-09-09 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20090909 * Merge with NetBSD make, pick up: o fix for -C, .CURDIR and .OBJDIR * boot-strap: o allow share_dir to be set independent of prefix. o select default share_dir better when prefix ends in $HOST_TARGET o if FORCE_BSD_MK etc were set, include them in the suggested install-mk command. 2009-09-08 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20090908 * Merge with NetBSD make, pick up: o .MAKE.LEVEL for recursion tracking o fix for :M scanning \: 2009-09-03 Simon J. Gerraty * configure.in: Don't -D__EXTENSIONS__ if AC_USE_SYSTEM_EXTENSIONS says "no". 2009-08-26 Simon J. Gerraty * Makefile.in (MAKE_VERSION): bump version to 20090826 Simplify MAKE_VERSION to just the bare date. * Merge with NetBSD make, pick up: o -C directory support. o support for SIGINFO o use $TMPDIR for temp files. o child of vfork should be careful about modifying parent's state. 2009-03-26 Simon J. Gerraty * Appy some patches for MiNT from David Brownlee 2009-02-26 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20090222 * Merge with NetBSD make, pick up: o Possible null pointer de-ref in Var_Set. 2009-02-08 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20090204 * Merge with NetBSD make, pick up: o bmake_malloc et al moved to their own .c o Count both () and {} when looking for the end of a :M pattern o Change 'Buffer' so that it is the actual struct, not a pointer to it. o strlist.c - functions for processing extendable arrays of pointers to strings. o ClientData replaced with void *, so const void * can be used. o New debug flag C for DEBUG_CWD 2008-11-11 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20081111 Apply patch from Joerg Sonnenberge to configure.in: o remove some redundant checks o check for emlloc etc only in libutil and require the whole family. util.c: o remove [v]asprintf which is no longer used. 2008-11-04 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20081101 * Merge with NetBSD make, pick up: o util.c: avoid use of putenv() - christos 2008-10-30 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20081030 pick up man page tweaks. 2008-10-29 Simon J. Gerraty * Makefile.in: move processing of LIBOBJS to after is definition! thus we'll have getenv.c in SRCS only if needed. * make.1: add examples of how to use :? * Makefile.in (BMAKE_VERSION): bump version to 20081029 * Merge with NetBSD make, pick up: o fix for .END processing with -j o segfault from Parse_Error when no makefile is open o handle numeric expressions in any variable expansion o debug output now defaults to stderr, -dF to change it - apb o make now uses bmake_malloc etc so that it can build natively on A/UX - wasn't an issue for bmake, but we want to keep in sync. 2008-09-27 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20080808 * Merge with NetBSD make, pick up: o fix for PR/38840: Pierre Pronchery: make crashes while parsing long lines in Makefiles o optimizations for VarQuote by joerg o fix for PR/38756: dominik: make dumps core on invalid makefile 2008-05-15 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20080515 * Merge with NetBSD make, pick up: o fix skip setting vars in VAR_GLOBAL context, to handle cases where VAR_CMD is used for other than command line vars. 2008-05-14 Simon J. Gerraty * boot-strap (make_version): we may need to look in $prefix/share/mk for sys.mk * Makefile.in (BMAKE_VERSION): bump version to 20080514 * Merge with NetBSD make, pick up: o skip setting vars in VAR_GLOBAL context, when already set in VAR_CMD which takes precedence. 2008-03-30 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20080330 * Merge with NetBSD make, pick up: o fix for ?= when LHS contains variable reference. 2008-02-15 Simon J. Gerraty * merge some patches from NetBSD pkgsrc. * makefile.boot.in (BOOTSTRAP_SYS_PATH): Allow better control of the MAKSYSPATH used during bootstrap. * Makefile.in (BMAKE_VERSION): bump version to 20080215 * Merge with NetBSD make, pick up: o warn if non-space chars follow 'empty' in a conditional. 2008-01-18 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20080118 * Merge with NetBSD make, pick up: o consider dependencies read from .depend as optional - dsl o remember when buffer for reading makefile grows - dsl o add -dl (aka LOUD) - David O'Brien 2007-10-22 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20071022 * Merge with NetBSD make, pick up: o Allow .PATH to be used for .include "" * boot-strap: source default settings from .bmake-boot-strap.rc 2007-10-16 Simon J. Gerraty * Makefile.in: fix maninstall on various systems provided that our man.mk is used. For non-BSD systems we install the preformatted page into $MANDIR/cat1 2007-10-15 Simon J. Gerraty * boot-strap: make bmake.1 too, so maninstall works. 2007-10-14 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20071014 * Merge with NetBSD make, pick up: o revamped handling of defshell - configure no longer needs to know the content of the shells array - apb o stop Var_Subst modifying its input - apb o avoid calling ParseTrackInput too often - dsl 2007-10-11 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20071011 * Merge with NetBSD make, pick up: o fix Shell_Init for case that _BASENAME_DEFSHELL is absolute path. * sigcompat.c: some tweaks for HP-UX 11.x based on patch from Tobias Nygren * configure.in: update handling of --with-defshell to match new make behavior. --with-defshell=/usr/xpg4/bin/sh will now do what one might hope - provided the chosen shell behaves enough like sh. 2007-10-08 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20071008 * Merge with NetBSD make, pick up: o .MAKE.JOB.PREFIX - control the token output before jobs - sjg o .export/.MAKE.EXPORTED - export of variables - sjg o .MAKE.MAKEFILES - track all makefiles read - sjg o performance improvements - dsl o revamp parallel job scheduling - dsl 2006-07-28 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20060728 * Merge with NetBSD make, pick up: o extra debug info during variable and cond processing - sjg o shell definition now covers newline - rillig o minor mem leak in PrintOnError - sjg 2006-05-11 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20060511 * Merge with NetBSD make, pick up: o more memory leaks - coverity o possible overflow in ArchFindMember - coverity o extract variable modifier code out of Var_Parse() so it can be called recursively - sjg o unit-tests/moderrs - sjg 2006-04-12 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20060412 * Merge with NetBSD make, pick up: o fixes for some memory leaks - coverity o only read first sys.mk etc when searching sysIncPath - sjg * main.c (ReadMakefile): remove hack for __INTERIX that prevented setting ${MAKEFILE} - OBATA Akio 2006-03-18 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20060318 * Merge with NetBSD make, pick up: o cleanup of job.c to remove remote handling, distcc is more useful and this code was likely bit-rotting - dsl o fix for :P modifier - sjg * boot-strap: set default prefix to something reasonable (for me anyway). 2006-03-01 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20060301 * Merge with NetBSD make, pick up: o make .WAIT apply recursively, document and test case - apb o allow variable modifiers in a variable appear anywhere in modifier list, document and test case - sjg 2006-02-22 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20060222 * Merge with NetBSD make, pick up: o improved job token handling - dsl o SIG_DFL the correct signal before exec - dsl o more debug info during parsing - dsl o allow variable modifiers to be specified via variable - sjg * boot-strap: explain why we died if no mksrc 2005-11-05 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20051105 * configure.in: always set default_sys_path default is ${prefix}/share/mk - remove prefix_sys_path, anyone wanting more than above needs to set it manually. 2005-11-04 Simon J. Gerraty * boot-strap: make this a bit easier for pkgsrc folk. bootstrap still fails on IRIX64 since MACHINE_ARCH gets set to 'mips' while pkgsrc wants 'mipseb' or 'mipsel' 2005-11-02 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20051102 * job.c (JobFinish): fix likely ancient merge lossage fix from Todd Vierling. * boot-strap (srcdir): allow setting mksrc=none 2005-10-31 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20051031 * ranlib.h: skip on OSF too. (NetBSD PR 31864) 2005-10-10 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20051002 fix a silly typo 2005-10-09 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20051001 support for UnixWare and some other systems, based on patches from pkgsrc/bootstrap 2005-09-03 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20050901 * Merge with NetBSD make, pick up: o possible parse error causing us to wander off. 2005-06-06 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20050606 * Merge with NetBSD make, pick up: o :0x modifier for randomizing a list o fixes for a number of -Wuninitialized issues. 2005-05-30 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20050530 * Merge with NetBSD make, pick up: o Handle dependencies for .BEGIN, .END and .INTERRUPT * README: was seriously out of date. 2005-03-22 Simon J. Gerraty * Important to use .MAKE rather than MAKE. 2005-03-15 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20050315 * Merge with NetBSD make, pick up: o don't mistake .elsefoo for .else o use suffix-specific search path correctly o bunch of style nits 2004-05-11 Simon J. Gerraty * boot-strap: o ensure that args to --src and --with-mksrc are resolved before giving them to configure. o add -o "objdir" so that builder can control it, default is $OS as determined by os.sh o add -q to suppress all the install instructions. 2004-05-08 Simon J. Gerraty * Remove __IDSTRING() * Makefile.in (BMAKE_VERSION): bump to 20040508 * Merge with NetBSD make, pick up: o posix fixes - remove '-e' from compat mode - add support for '+' command-line prefix. o fix for handling '--' on command-line. o fix include in lst.lib/lstInt.h to simplify '-I's o we also picked up replacement of MAKE_BOOTSTRAP with !MAKE_NATIVE which is a noop, but possibly confusing. 2004-04-14 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20040414 * Merge with NetBSD make, pick up: o allow quoted strings on lhs of conditionals o issue warning when extra .else is seen o print line numer when errors encountered during parsing from string. 2004-02-20 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20040220 * Merge with NetBSD make, pick up: o fix for old :M parsing bug. o re-jigged unit-tests 2004-02-15 Simon J. Gerraty * Makefile.in (accept test): use ${.MAKE:S,^./,${.CURDIR}/,} so that './bmake -f Makefile test' works. 2004-02-14 Simon J. Gerraty * Makefile.in: (BMAKE_VERSION): bump to 20040214 * Merge with NetBSD make, pick up: o search upwards for *.mk o fix for double free of var substitution buffers o use of getopt replaced with custom code, since the usage (re-scanning) isn't posix compatible. 2004-02-12 Simon J. Gerraty * arch.c: don't include ranlib.h on ELF systems (thanks to Chuck Cranor ). 2004-01-18 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump to 20040118 * boot-strap (while): export vars we assign to on cmdline * unit-test/Makefile.in: ternary is .PHONY 2004-01-08 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20040108 * Merge with NetBSD make, pick up: o fix for ternary modifier 2004-01-06 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20040105 * Merge with NetBSD make, pick up: o fix for cond.c to handle compound expressions better o variable expansion within sysV style replacements 2003-12-22 Simon J. Gerraty * Make portable snprintf safer - output to /dev/null first to check space needed. * Makefile.in (BMAKE_VERSION): bump version to 20031222 * Merge with NetBSD make, pick up: o -dg3 to show input graph when things go wrong. o explicitly look for makefiles in objdir if not found in curdir so that errors in .depend etc will be reported accurarely. o avoid use of -e in shell scripts in jobs mode, use '|| exit $?' instead as it more accurately reflects the expected behavior and is more consistently implemented. o avoid use of asprintf. 2003-09-28 Simon J. Gerraty * util.c: Add asprintf and vasprintf. * Makefile.in (BMAKE_VERSION): bump version to 20030928 * Merge with NetBSD make, pick up: :[] modifier - allows picking words from a variable. :tW modifier - allows treating value as one big word. W flag for :C and :S - allows treating value as one big word. 2003-09-12 Simon J. Gerraty * Merge with NetBSD make pick up -de flag to enable printing failed command. don't skip 1st two dir entries (normally . and ..) since coda does not have them. 2003-09-09 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20030909 * Merge with NetBSD make, pick up: - changes for -V '${VAR}' to print fully expanded value cf. -V VAR - CompatRunCommand now prints the command that failed. - several files got updated 3 clause Berkeley license. 2003-08-02 Simon J. Gerraty * boot-strap: Allow setting configure args on command line. 2003-07-31 Simon J. Gerraty * configure.in: add --with-defshell to allow sh or ksh to be selected as default shell. * Makefile.in: bump version to 20030731 * Merge with NetBSD make Pick up .SHELL spec for ksh and associate man page changes. Also compat mode now uses the same shell specs. 2003-07-29 Simon J. Gerraty * var.c (Var_Parse): ensure delim is initialized. * unit-tests/Makefile.in: use single quotes to avoid problems from some shells. * makefile.boot.in: Run the unit-tests as part of the bootstrap procedure. 2003-07-28 Simon J. Gerraty * unit-tests/Makefile.in: always force complaints from ${TEST_MAKE} to be from 'make'. * configure.in: add check for 'diff -u' also fix some old autoconf'isms * Makefile.in (BMAKE_VERSION): bump version to 20030728. if using GCC add -Wno-cast-qual to CFLAGS for var.o * Merge with NetBSD make Pick up fix for :ts parsing error in some cases. Pick unit-tests. 2003-07-23 Simon J. Gerraty * Makefile.in (BMAKE_VERSION): bump version to 20030723. * var.c (Var_Parse): fix bug in :ts modifier, after const correctness fixes, must pass nstr to VarModify. 2003-07-14 Simon J. Gerraty * Makefile.in: BMAKE_VERSION switch to a date based version. We'll generally use the date of last import from NetBSD. * Merge with NetBSD make Pick up fixes for const-correctness, now passes WARNS=3 on NetBSD. Pick up :ts modifier, allows controlling the separator used between words in variable expansion. 2003-07-11 Simon J. Gerraty * FILES: include boot-strap and os.sh * Makefile.in: only set WARNS if we are NetBSD, the effect on FreeBSD is known to be bad. * makefile.boot.in (bootstrap): make this the default target. * Makefile.in: bump version to 3.1.19 * machine.sh: avoid A-Z with tr as it is bound to lose. 2003-07-10 Simon J. Gerraty * Merge with NetBSD make Pick up fix for PR/19781 - unhelpful error msg on unclosed ${var:foo Plus some doc fixes. 2003-04-27 Simon J. Gerraty * Merge with NetBSD make Pick up fix for PR/1523 - don't count a library as built, if there is no way to build it * Bump version to 3.1.18 2003-03-23 Simon J. Gerraty * Merge with NetBSD make Pick up fix for ParseDoSpecialSrc - we only use it if .WAIT appears in src list. 2003-03-21 Simon J. Gerraty * Merge with NetBSD make (mmm 10th anniversary!) pick up fix for .WAIT in srcs that refer to $@ or $* (PR#20828) pick up -X which tells us to not export VAR=val via setenv if we are already doing so via MAKEFLAGS. This saves valuable env space on systems like Darwin. set MAKE_VERSION to 3.1.17 * parse.c: pix up fix for suffix rules 2003-03-06 Simon J. Gerraty * Merge with NetBSD make. pick up fix for propagating -B via MAKEFLAGS. set MAKE_VERSION to 3.1.16 * Apply some patches from pkgsrc-bootstrap/bmake Originally by Grant Beattie I may have missed some - since they are based on bmake-3.1.12 2002-12-03 Simon J. Gerraty * makefile.boot.in (bmake): update install targets for those that use them, also clear MAKEFLAGS when invoking bmake.boot to avoid havoc from gmake -w. Thanks to Harlan Stenn . * bmake.cat1: update the pre-formatted man page! 2002-11-30 Simon J. Gerraty * Merge with NetBSD make. pick up fix for premature free of pointer used in call to Dir_InitCur(). set MAKE_VERSION to 3.1.15 2002-11-26 Simon J. Gerraty * configure.in: determine suitable value for MKSRC. override using --with-mksrc=PATH. * machine.sh: use `uname -p` for MACHINE_ARCH on modern SunOS systems. configs(8) will use 'sun4' as an alias for 'sparc'. 2002-11-25 Simon J. Gerraty * Merge with NetBSD make. pick up ${.PATH} pick up fix for finding ../cat.c via .PATH when .CURDIR=.. set MAKE_VERSION to 3.1.14 add configure checks for killpg and sys/socket.h 2002-09-16 Simon J. Gerraty * tag bmake-3-1-13 * makefile.boot.in (bmake): use install-mk Also setup ./mk before trying to invoke bmake.boot incase we needed install-mk to create a sys.mk for us. * configure.in: If we need to add -I${srcdir}/missing, make it an absolute path so that it works for lst.lib too. * make.h: always include sys/cdefs.h since we provide one if the host does not. * Makefile.in (install-mk): use MKSRC/install-mk which will do the right thing. use uname -p for ARCH if possible. since install-mk will setup links bsd.prog.mk -> prog.mk if needed, just .include bsd.prog.mk * Merge with NetBSD make (NetBSD-1.6) Code is ansi-C only now. Bug in handling of dotLast is fixed. Can now assign .OBJDIR and make will reset its notions of life. New modifiers :tu :tl for toUpper and toLower. Tue Oct 16 12:18:42 2001 Simon J. Gerraty * Merge with NetBSD make pick up fix for .END failure in compat mode. pick up fix for extra va_end() in ParseVErrorInternal. Thu Oct 11 13:20:06 2001 Simon J. Gerraty * configure.in: for systems that have sys/cdefs.h check if it is compatible. If not, include the one under missing, but tell it to include the native one too - necessary on Linux. * missing/sys/cdefs.h: if NEED_HOST_CDEFS_H is defined, use include_next (for gcc) to get the native sys/cdefs.h Tue Aug 21 02:29:34 2001 Simon J. Gerraty * job.c (JobFinish): Fix an earlier merge bug that resulted in leaking descriptors when using -jN. * job.c (JobPrintCommand): See if "curdir" exists before attempting to chdir(). Doing the chdir directly in make (when in compat mode) fails silently, so let the -jN version do the same. This can happen when building kernels in an object tree and playing clever games to reset .CURDIR. * Merged with NetBSD make pick up .USEBEFORE Tue Jun 26 23:45:11 2001 Simon J. Gerraty * makefile.boot.in: Give bmake.boot a MAKESYSPATH that might work. Tue Jun 12 16:48:57 2001 Simon J. Gerraty * var.c (Var_Set): Add 4th (flags) arg so VarLoopExpand can tell us not to export the iterator variable when using VAR_CMD context. Sun Jun 10 21:55:21 2001 Simon J. Gerraty * job.c (Job_CatchChildren): don't call Job_CatchOutput() here, its the wrong "fix". Sat Jun 9 00:11:24 2001 Simon J. Gerraty * Redesigned export of VAR_CMD's via MAKEFLAGS. We now simply append the variable names to .MAKEOVERRIDES, and handle duplicate suppression and quoting in ExportMAKEFLAGS using: ${.MAKEOVERRIDES:O:u:@v@$v=${$v:Q}@} Apart from fixing quoting bugs in previous version, this allows us to export vars to the environment by simply doing: .MAKEOVERRIDES+= PATH Merged again with NetBSD make, but the above is the only change. * configure.in: added --disable-pwd-override disable $PWD overriding getcwd() --disable-check-make-chdir disable make trying to guess when it should automatically cd ${.CURDIR} * Merge with NetBSD make, changes include: parse.c (ParseDoDependency): Spot that the syntax error is caused by an unresolved cvs/rcs conflict and say so. var.c: most of Var* functions now take a ctxt as 1st arg. now does variable substituion on rhs of sysv style modifiers. * var.c (Var_Set): exporting of command line variables (VAR_CMD) is now done here. We append the name='value' to .MAKEOVERRIDES rather than directly into MAKEFLAGS as this allows a Makefile to use .MAKEOVERRIDES= to disable this behaviour. GNU make uses a very similar mechanism. Note that in adding name='value' to .MAKEOVERRIDES we do the moral equivalent of: .MAKEOVERRIDES:= ${.MAKEOVERRIDES:Nname=*} name='val' Fri Jun 1 14:08:02 2001 Simon J. Gerraty * make-conf.h (USE_IOVEC): make it conditional on HAVE_SYS_UIO_H * Merged with NetBSD make make -dx can now be used to run commands via sh -x better error messages on exec failures. Thu May 31 01:44:54 2001 Simon J. Gerraty * Makefile.in (main.o): depends on ${SRCS} ${MAKEFILE} so that MAKE_VERSION gets updated. Also don't use ?= for MAKE_VERSION, MACHINE etc otherwise they propagate from the previous bmake. * configure.in (machine): allow --with-machine=generic to make configure use machine.sh to set MACHINE. * job.c (JobInterrupt): convert to using WAIT_T and friends. * Makefile.in: mention in bmake.1 that we use autoconf. * make.1: mention MAKE_PRINT_VAR_ON_ERROR. Wed May 30 23:17:18 2001 Simon J. Gerraty * main.c (ReadMakefile): don't set MAKEFILE if reading ".depend" as that rather defeats the usefulness of ${MAKEFILE}. * main.c (MainParseArgs): append command line variable assignments to MAKEFLAGS so that they get propagated to child make's. Apparently this is required POSIX behaviour? Its useful anyway. Tue May 29 02:20:07 2001 Simon J. Gerraty * compat.c (CompatRunCommand): don't use perror() since stdio may cause problems in child of vfork(). * compat.c, main.c: Call PrintOnError() when we are going to bail. This routine prints out the .curdir where we stopped and will also display any vars listed in ${MAKE_PRINT_VAR_ON_ERROR}. * main.c: add ${.newline} to hold a "\n" - sometimes handy in :@ expansion. * var.c: VarLoopExpand: ignore addSpace if a \n is present. * Added RCSid's for the files we've touched. Thu May 24 15:41:37 2001 Simon J. Gerraty * configure.in: Thanks to some clues from mdb@juniper.net, added autoconf magic to control setting of MACHINE, MACHINE_ARCH as well as what ends up in _PATH_DEFSYSPATH. We now have: --with-machine=MACHINE explicitly set MACHINE --with-force-machine=MACHINE set FORCE_MACHINE --with-machine_arch=MACHINE_ARCH explicitly set MACHINE_ARCH --with-default-sys-path=PATH:DIR:LIST use an explicit _PATH_DEFSYSPATH --with-prefix-sys-path=PATH:DIR:LIST prefix _PATH_PREFIX_SYSPATH --with-path-objdirprefix=PATH override _PATH_OBJDIRPREFIX If _PATH_OBJDIRPREFIX is set to "no" we won't define it. * makefile: added a pathetically simple makefile to drive bootstrapping. Running configure by hand is more useful. * Makefile.in: added MAKE_VERSION, and reworked things to be less dependent on NetBSD bsd.*.mk * pathnames.h: allow NO_PATH_OBJDIRPREFIX to stop us defining _PATH_OBJDIRPREFIX for those that don't want a default. construct _PATH_DEFSYSPATH from the info we get from configure. * main.c: allow for no _PATH_OBJDIRPREFIX, set ${MAKE_VERSION} if MAKE_VERSION is defined. * compat.c: when we bail, print out the .CURDIR we were in. Sat May 12 00:34:12 2001 Simon J. Gerraty * Merged with NetBSD make * var.c: fixed a bug in the handling of the modifier :P if the node as found but the path was null, we segfault trying to duplicate it. Mon Mar 5 16:20:33 2001 Simon J. Gerraty * Merged with NetBSD make * make.c: Make_OODate's test for a library out of date was using cmtime where it should have used mtime (my bug). * compat.c: Use perror() to tell us what really went wrong when we cannot exec a command. Fri Dec 15 10:11:08 2000 Simon J. Gerraty * Merged with NetBSD make Sat Jun 10 10:11:08 2000 Simon J. Gerraty * Merged with NetBSD make Thu Jun 1 10:11:08 2000 Simon J. Gerraty * Merged with NetBSD make Tue May 30 10:11:08 2000 Simon J. Gerraty * Merged with NetBSD make Thu Apr 27 00:07:47 2000 Simon J. Gerraty * util.c: don't provide signal() since we use sigcompat.c * Makefile.in: added a build target. * var.c (Var_Parse): added ODE modifiers :U, :D, :L, :P, :@ and :! These allow some quite clever magic. * main.c (main): added support for getenv(MAKESYSPATH). Mon Apr 2 16:25:13 2000 Simon J. Gerraty * Disable $PWD overriding getcwd() if MAKEOBJDIRPREFIX is set. This avoids objdir having a different value depending on how a directory was reached (via command line, or subdir.mk). * If FORCE_MACHINE is defined, ignore getenv("MACHINE"). Mon Apr 2 23:15:31 2000 Simon J. Gerraty * Do a chdir(${.CURDIR}) before invoking ${.MAKE} or ${.MAKE:T} if MAKEOBJDIRPREFIX is set and NOCHECKMAKECHDIR is not. I've been testing this in NetBSD's make for some weeks. * Turn Makefile into Makefile.in and make it useful. Tue Feb 29 22:08:00 2000 Simon J. Gerraty * Imported NetBSD's -current make(1) and resolve conflicts. * Applied autoconf patches from bmake v2 * Imported clean code base from NetBSD-1.0 diff --git a/FILES b/FILES index dedc29767658..8e2513e1c183 100644 --- a/FILES +++ b/FILES @@ -1,770 +1,830 @@ ChangeLog FILES LICENSE Makefile Makefile.config.in PSD.doc/Makefile PSD.doc/tutorial.ms README VERSION aclocal.m4 arch.c bmake.1 bmake.cat1 boot-strap bsd.after-import.mk buf.c buf.h compat.c cond.c config.h.in configure configure.in dir.c dir.h dirname.c enum.c enum.h filemon/filemon.h filemon/filemon_dev.c filemon/filemon_ktrace.c find_lib.sh for.c getopt.c hash.c hash.h install-sh job.c job.h lst.c lst.h machine.sh main.c make-bootstrap.sh.in make-conf.h make.1 make.c make.h make_malloc.c make_malloc.h makefile.in meta.c meta.h metachar.c metachar.h missing/sys/cdefs.h mkdeps.sh nonints.h os.sh parse.c pathnames.h ranlib.h realpath.c setenv.c sigcompat.c str.c stresep.c strlcpy.c suff.c targ.c trace.c trace.h unit-tests/Makefile unit-tests/Makefile.config.in unit-tests/archive-suffix.exp unit-tests/archive-suffix.mk unit-tests/archive.exp unit-tests/archive.mk +unit-tests/cmd-errors-jobs.exp +unit-tests/cmd-errors-jobs.mk unit-tests/cmd-errors-lint.exp unit-tests/cmd-errors-lint.mk unit-tests/cmd-errors.exp unit-tests/cmd-errors.mk unit-tests/cmd-interrupt.exp unit-tests/cmd-interrupt.mk unit-tests/cmdline-undefined.exp unit-tests/cmdline-undefined.mk unit-tests/cmdline.exp unit-tests/cmdline.mk unit-tests/comment.exp unit-tests/comment.mk +unit-tests/compat-error.exp +unit-tests/compat-error.mk unit-tests/cond-cmp-numeric-eq.exp unit-tests/cond-cmp-numeric-eq.mk unit-tests/cond-cmp-numeric-ge.exp unit-tests/cond-cmp-numeric-ge.mk unit-tests/cond-cmp-numeric-gt.exp unit-tests/cond-cmp-numeric-gt.mk unit-tests/cond-cmp-numeric-le.exp unit-tests/cond-cmp-numeric-le.mk unit-tests/cond-cmp-numeric-lt.exp unit-tests/cond-cmp-numeric-lt.mk unit-tests/cond-cmp-numeric-ne.exp unit-tests/cond-cmp-numeric-ne.mk unit-tests/cond-cmp-numeric.exp unit-tests/cond-cmp-numeric.mk unit-tests/cond-cmp-string.exp unit-tests/cond-cmp-string.mk unit-tests/cond-cmp-unary.exp unit-tests/cond-cmp-unary.mk +unit-tests/cond-eof.exp +unit-tests/cond-eof.mk unit-tests/cond-func-commands.exp unit-tests/cond-func-commands.mk unit-tests/cond-func-defined.exp unit-tests/cond-func-defined.mk unit-tests/cond-func-empty.exp unit-tests/cond-func-empty.mk unit-tests/cond-func-exists.exp unit-tests/cond-func-exists.mk +unit-tests/cond-func-make-main.exp +unit-tests/cond-func-make-main.mk unit-tests/cond-func-make.exp unit-tests/cond-func-make.mk unit-tests/cond-func-target.exp unit-tests/cond-func-target.mk unit-tests/cond-func.exp unit-tests/cond-func.mk unit-tests/cond-late.exp unit-tests/cond-late.mk unit-tests/cond-op-and-lint.exp unit-tests/cond-op-and-lint.mk unit-tests/cond-op-and.exp unit-tests/cond-op-and.mk unit-tests/cond-op-not.exp unit-tests/cond-op-not.mk unit-tests/cond-op-or-lint.exp unit-tests/cond-op-or-lint.mk unit-tests/cond-op-or.exp unit-tests/cond-op-or.mk unit-tests/cond-op-parentheses.exp unit-tests/cond-op-parentheses.mk unit-tests/cond-op.exp unit-tests/cond-op.mk unit-tests/cond-short.exp unit-tests/cond-short.mk unit-tests/cond-token-number.exp unit-tests/cond-token-number.mk unit-tests/cond-token-plain.exp unit-tests/cond-token-plain.mk unit-tests/cond-token-string.exp unit-tests/cond-token-string.mk unit-tests/cond-token-var.exp unit-tests/cond-token-var.mk unit-tests/cond-undef-lint.exp unit-tests/cond-undef-lint.mk unit-tests/cond1.exp unit-tests/cond1.mk unit-tests/counter-append.exp unit-tests/counter-append.mk unit-tests/counter.exp unit-tests/counter.mk unit-tests/dep-colon-bug-cross-file.exp unit-tests/dep-colon-bug-cross-file.mk unit-tests/dep-colon.exp unit-tests/dep-colon.mk unit-tests/dep-double-colon-indep.exp unit-tests/dep-double-colon-indep.mk unit-tests/dep-double-colon.exp unit-tests/dep-double-colon.mk unit-tests/dep-exclam.exp unit-tests/dep-exclam.mk unit-tests/dep-none.exp unit-tests/dep-none.mk unit-tests/dep-percent.exp unit-tests/dep-percent.mk unit-tests/dep-var.exp unit-tests/dep-var.mk unit-tests/dep-wildcards.exp unit-tests/dep-wildcards.mk unit-tests/dep.exp unit-tests/dep.mk unit-tests/depsrc-end.exp unit-tests/depsrc-end.mk unit-tests/depsrc-exec.exp unit-tests/depsrc-exec.mk unit-tests/depsrc-ignore.exp unit-tests/depsrc-ignore.mk unit-tests/depsrc-made.exp unit-tests/depsrc-made.mk unit-tests/depsrc-make.exp unit-tests/depsrc-make.mk unit-tests/depsrc-meta.exp unit-tests/depsrc-meta.mk unit-tests/depsrc-nometa.exp unit-tests/depsrc-nometa.mk unit-tests/depsrc-nometa_cmp.exp unit-tests/depsrc-nometa_cmp.mk unit-tests/depsrc-nopath.exp unit-tests/depsrc-nopath.mk unit-tests/depsrc-notmain.exp unit-tests/depsrc-notmain.mk unit-tests/depsrc-optional.exp unit-tests/depsrc-optional.mk unit-tests/depsrc-phony.exp unit-tests/depsrc-phony.mk unit-tests/depsrc-precious.exp unit-tests/depsrc-precious.mk unit-tests/depsrc-recursive.exp unit-tests/depsrc-recursive.mk unit-tests/depsrc-silent.exp unit-tests/depsrc-silent.mk unit-tests/depsrc-use.exp unit-tests/depsrc-use.mk unit-tests/depsrc-usebefore-double-colon.exp unit-tests/depsrc-usebefore-double-colon.mk unit-tests/depsrc-usebefore.exp unit-tests/depsrc-usebefore.mk unit-tests/depsrc-wait.exp unit-tests/depsrc-wait.mk unit-tests/depsrc.exp unit-tests/depsrc.mk +unit-tests/deptgt-begin-fail-indirect.exp +unit-tests/deptgt-begin-fail-indirect.mk +unit-tests/deptgt-begin-fail.exp +unit-tests/deptgt-begin-fail.mk unit-tests/deptgt-begin.exp unit-tests/deptgt-begin.mk unit-tests/deptgt-default.exp unit-tests/deptgt-default.mk unit-tests/deptgt-delete_on_error.exp unit-tests/deptgt-delete_on_error.mk +unit-tests/deptgt-end-fail-all.exp +unit-tests/deptgt-end-fail-all.mk +unit-tests/deptgt-end-fail-indirect.exp +unit-tests/deptgt-end-fail-indirect.mk +unit-tests/deptgt-end-fail.exp +unit-tests/deptgt-end-fail.mk unit-tests/deptgt-end-jobs.exp unit-tests/deptgt-end-jobs.mk unit-tests/deptgt-end.exp unit-tests/deptgt-end.mk unit-tests/deptgt-error.exp unit-tests/deptgt-error.mk unit-tests/deptgt-ignore.exp unit-tests/deptgt-ignore.mk unit-tests/deptgt-interrupt.exp unit-tests/deptgt-interrupt.mk unit-tests/deptgt-main.exp unit-tests/deptgt-main.mk unit-tests/deptgt-makeflags.exp unit-tests/deptgt-makeflags.mk unit-tests/deptgt-no_parallel.exp unit-tests/deptgt-no_parallel.mk unit-tests/deptgt-nopath.exp unit-tests/deptgt-nopath.mk unit-tests/deptgt-notparallel.exp unit-tests/deptgt-notparallel.mk unit-tests/deptgt-objdir.exp unit-tests/deptgt-objdir.mk unit-tests/deptgt-order.exp unit-tests/deptgt-order.mk unit-tests/deptgt-path-suffix.exp unit-tests/deptgt-path-suffix.mk unit-tests/deptgt-path.exp unit-tests/deptgt-path.mk unit-tests/deptgt-phony.exp unit-tests/deptgt-phony.mk unit-tests/deptgt-precious.exp unit-tests/deptgt-precious.mk unit-tests/deptgt-shell.exp unit-tests/deptgt-shell.mk unit-tests/deptgt-silent.exp unit-tests/deptgt-silent.mk unit-tests/deptgt-stale.exp unit-tests/deptgt-stale.mk unit-tests/deptgt-suffixes.exp unit-tests/deptgt-suffixes.mk unit-tests/deptgt.exp unit-tests/deptgt.mk unit-tests/dir-expand-path.exp unit-tests/dir-expand-path.mk unit-tests/dir.exp unit-tests/dir.mk unit-tests/directive-dinclude.exp unit-tests/directive-dinclude.mk unit-tests/directive-elif.exp unit-tests/directive-elif.mk unit-tests/directive-elifdef.exp unit-tests/directive-elifdef.mk unit-tests/directive-elifmake.exp unit-tests/directive-elifmake.mk unit-tests/directive-elifndef.exp unit-tests/directive-elifndef.mk unit-tests/directive-elifnmake.exp unit-tests/directive-elifnmake.mk unit-tests/directive-else.exp unit-tests/directive-else.mk +unit-tests/directive-endfor.exp +unit-tests/directive-endfor.mk unit-tests/directive-endif.exp unit-tests/directive-endif.mk unit-tests/directive-error.exp unit-tests/directive-error.mk unit-tests/directive-export-env.exp unit-tests/directive-export-env.mk unit-tests/directive-export-gmake.exp unit-tests/directive-export-gmake.mk +unit-tests/directive-export-impl.exp +unit-tests/directive-export-impl.mk unit-tests/directive-export-literal.exp unit-tests/directive-export-literal.mk unit-tests/directive-export.exp unit-tests/directive-export.mk +unit-tests/directive-for-errors.exp +unit-tests/directive-for-errors.mk +unit-tests/directive-for-escape.exp +unit-tests/directive-for-escape.mk unit-tests/directive-for-generating-endif.exp unit-tests/directive-for-generating-endif.mk +unit-tests/directive-for-lines.exp +unit-tests/directive-for-lines.mk +unit-tests/directive-for-null.exp +unit-tests/directive-for-null.mk unit-tests/directive-for.exp unit-tests/directive-for.mk unit-tests/directive-hyphen-include.exp unit-tests/directive-hyphen-include.mk unit-tests/directive-if-nested.exp unit-tests/directive-if-nested.mk unit-tests/directive-if.exp unit-tests/directive-if.mk unit-tests/directive-ifdef.exp unit-tests/directive-ifdef.mk unit-tests/directive-ifmake.exp unit-tests/directive-ifmake.mk unit-tests/directive-ifndef.exp unit-tests/directive-ifndef.mk unit-tests/directive-ifnmake.exp unit-tests/directive-ifnmake.mk unit-tests/directive-include-fatal.exp unit-tests/directive-include-fatal.mk unit-tests/directive-include.exp unit-tests/directive-include.mk unit-tests/directive-info.exp unit-tests/directive-info.mk +unit-tests/directive-misspellings.exp +unit-tests/directive-misspellings.mk unit-tests/directive-sinclude.exp unit-tests/directive-sinclude.mk unit-tests/directive-undef.exp unit-tests/directive-undef.mk unit-tests/directive-unexport-env.exp unit-tests/directive-unexport-env.mk unit-tests/directive-unexport.exp unit-tests/directive-unexport.mk unit-tests/directive-warning.exp unit-tests/directive-warning.mk unit-tests/directive.exp unit-tests/directive.mk unit-tests/dollar.exp unit-tests/dollar.mk unit-tests/doterror.exp unit-tests/doterror.mk unit-tests/dotwait.exp unit-tests/dotwait.mk unit-tests/envfirst.exp unit-tests/envfirst.mk unit-tests/error.exp unit-tests/error.mk unit-tests/escape.exp unit-tests/escape.mk unit-tests/export-all.exp unit-tests/export-all.mk unit-tests/export-env.exp unit-tests/export-env.mk unit-tests/export-variants.exp unit-tests/export-variants.mk unit-tests/export.exp unit-tests/export.mk unit-tests/forloop.exp unit-tests/forloop.mk unit-tests/forsubst.exp unit-tests/forsubst.mk unit-tests/gnode-submake.exp unit-tests/gnode-submake.mk unit-tests/hanoi-include.exp unit-tests/hanoi-include.mk unit-tests/impsrc.exp unit-tests/impsrc.mk unit-tests/include-main.exp unit-tests/include-main.mk unit-tests/include-sub.mk unit-tests/include-subsub.mk unit-tests/job-flags.exp unit-tests/job-flags.mk unit-tests/job-output-long-lines.exp unit-tests/job-output-long-lines.mk +unit-tests/jobs-error-indirect.exp +unit-tests/jobs-error-indirect.mk +unit-tests/jobs-error-nested-make.exp +unit-tests/jobs-error-nested-make.mk +unit-tests/jobs-error-nested.exp +unit-tests/jobs-error-nested.mk unit-tests/lint.exp unit-tests/lint.mk unit-tests/make-exported.exp unit-tests/make-exported.mk +unit-tests/meta-cmd-cmp.exp +unit-tests/meta-cmd-cmp.mk unit-tests/moderrs.exp unit-tests/moderrs.mk unit-tests/modmatch.exp unit-tests/modmatch.mk unit-tests/modmisc.exp unit-tests/modmisc.mk unit-tests/modts.exp unit-tests/modts.mk unit-tests/modword.exp unit-tests/modword.mk unit-tests/objdir-writable.exp unit-tests/objdir-writable.mk unit-tests/opt-backwards.exp unit-tests/opt-backwards.mk unit-tests/opt-chdir.exp unit-tests/opt-chdir.mk unit-tests/opt-debug-all.exp unit-tests/opt-debug-all.mk unit-tests/opt-debug-archive.exp unit-tests/opt-debug-archive.mk unit-tests/opt-debug-cond.exp unit-tests/opt-debug-cond.mk unit-tests/opt-debug-curdir.exp unit-tests/opt-debug-curdir.mk unit-tests/opt-debug-dir.exp unit-tests/opt-debug-dir.mk unit-tests/opt-debug-errors.exp unit-tests/opt-debug-errors.mk unit-tests/opt-debug-file.exp unit-tests/opt-debug-file.mk unit-tests/opt-debug-for.exp unit-tests/opt-debug-for.mk unit-tests/opt-debug-graph1.exp unit-tests/opt-debug-graph1.mk unit-tests/opt-debug-graph2.exp unit-tests/opt-debug-graph2.mk unit-tests/opt-debug-graph3.exp unit-tests/opt-debug-graph3.mk unit-tests/opt-debug-hash.exp unit-tests/opt-debug-hash.mk unit-tests/opt-debug-jobs.exp unit-tests/opt-debug-jobs.mk unit-tests/opt-debug-lint.exp unit-tests/opt-debug-lint.mk unit-tests/opt-debug-loud.exp unit-tests/opt-debug-loud.mk unit-tests/opt-debug-making.exp unit-tests/opt-debug-making.mk unit-tests/opt-debug-meta.exp unit-tests/opt-debug-meta.mk unit-tests/opt-debug-no-rm.exp unit-tests/opt-debug-no-rm.mk unit-tests/opt-debug-parse.exp unit-tests/opt-debug-parse.mk unit-tests/opt-debug-suff.exp unit-tests/opt-debug-suff.mk unit-tests/opt-debug-targets.exp unit-tests/opt-debug-targets.mk unit-tests/opt-debug-var.exp unit-tests/opt-debug-var.mk unit-tests/opt-debug-varraw.exp unit-tests/opt-debug-varraw.mk unit-tests/opt-debug-x-trace.exp unit-tests/opt-debug-x-trace.mk unit-tests/opt-debug.exp unit-tests/opt-debug.mk unit-tests/opt-define.exp unit-tests/opt-define.mk unit-tests/opt-env.exp unit-tests/opt-env.mk unit-tests/opt-file.exp unit-tests/opt-file.mk unit-tests/opt-ignore.exp unit-tests/opt-ignore.mk unit-tests/opt-include-dir.exp unit-tests/opt-include-dir.mk unit-tests/opt-jobs-internal.exp unit-tests/opt-jobs-internal.mk +unit-tests/opt-jobs-no-action.exp +unit-tests/opt-jobs-no-action.mk unit-tests/opt-jobs.exp unit-tests/opt-jobs.mk +unit-tests/opt-keep-going-multiple.exp +unit-tests/opt-keep-going-multiple.mk unit-tests/opt-keep-going.exp unit-tests/opt-keep-going.mk unit-tests/opt-m-include-dir.exp unit-tests/opt-m-include-dir.mk unit-tests/opt-no-action-at-all.exp unit-tests/opt-no-action-at-all.mk +unit-tests/opt-no-action-runflags.exp +unit-tests/opt-no-action-runflags.mk unit-tests/opt-no-action.exp unit-tests/opt-no-action.mk unit-tests/opt-query.exp unit-tests/opt-query.mk unit-tests/opt-raw.exp unit-tests/opt-raw.mk unit-tests/opt-silent.exp unit-tests/opt-silent.mk unit-tests/opt-touch-jobs.exp unit-tests/opt-touch-jobs.mk unit-tests/opt-touch.exp unit-tests/opt-touch.mk unit-tests/opt-tracefile.exp unit-tests/opt-tracefile.mk unit-tests/opt-var-expanded.exp unit-tests/opt-var-expanded.mk unit-tests/opt-var-literal.exp unit-tests/opt-var-literal.mk unit-tests/opt-warnings-as-errors.exp unit-tests/opt-warnings-as-errors.mk unit-tests/opt-where-am-i.exp unit-tests/opt-where-am-i.mk unit-tests/opt-x-reduce-exported.exp unit-tests/opt-x-reduce-exported.mk unit-tests/opt.exp unit-tests/opt.mk unit-tests/order.exp unit-tests/order.mk unit-tests/parse-var.exp unit-tests/parse-var.mk unit-tests/phony-end.exp unit-tests/phony-end.mk unit-tests/posix.exp unit-tests/posix.mk unit-tests/posix1.exp unit-tests/posix1.mk -unit-tests/qequals.exp -unit-tests/qequals.mk unit-tests/recursive.exp unit-tests/recursive.mk unit-tests/sh-dots.exp unit-tests/sh-dots.mk +unit-tests/sh-errctl.exp +unit-tests/sh-errctl.mk +unit-tests/sh-flags.exp +unit-tests/sh-flags.mk unit-tests/sh-jobs-error.exp unit-tests/sh-jobs-error.mk unit-tests/sh-jobs.exp unit-tests/sh-jobs.mk unit-tests/sh-leading-at.exp unit-tests/sh-leading-at.mk unit-tests/sh-leading-hyphen.exp unit-tests/sh-leading-hyphen.mk unit-tests/sh-leading-plus.exp unit-tests/sh-leading-plus.mk unit-tests/sh-meta-chars.exp unit-tests/sh-meta-chars.mk unit-tests/sh-multi-line.exp unit-tests/sh-multi-line.mk unit-tests/sh-single-line.exp unit-tests/sh-single-line.mk unit-tests/sh.exp unit-tests/sh.mk unit-tests/shell-csh.exp unit-tests/shell-csh.mk unit-tests/shell-custom.exp unit-tests/shell-custom.mk unit-tests/shell-ksh.exp unit-tests/shell-ksh.mk unit-tests/shell-sh.exp unit-tests/shell-sh.mk unit-tests/suff-add-later.exp unit-tests/suff-add-later.mk unit-tests/suff-clear-regular.exp unit-tests/suff-clear-regular.mk unit-tests/suff-clear-single.exp unit-tests/suff-clear-single.mk +unit-tests/suff-incomplete.exp +unit-tests/suff-incomplete.mk unit-tests/suff-lookup.exp unit-tests/suff-lookup.mk +unit-tests/suff-main-several.exp +unit-tests/suff-main-several.mk unit-tests/suff-main.exp unit-tests/suff-main.mk +unit-tests/suff-phony.exp +unit-tests/suff-phony.mk unit-tests/suff-rebuild.exp unit-tests/suff-rebuild.mk unit-tests/suff-self.exp unit-tests/suff-self.mk +unit-tests/suff-transform-debug.exp +unit-tests/suff-transform-debug.mk unit-tests/suff-transform-endless.exp unit-tests/suff-transform-endless.mk unit-tests/suff-transform-expand.exp unit-tests/suff-transform-expand.mk unit-tests/suff-transform-select.exp unit-tests/suff-transform-select.mk unit-tests/sunshcmd.exp unit-tests/sunshcmd.mk unit-tests/ternary.exp unit-tests/ternary.mk unit-tests/unexport-env.exp unit-tests/unexport-env.mk unit-tests/unexport.exp unit-tests/unexport.mk unit-tests/use-inference.exp unit-tests/use-inference.mk unit-tests/var-class-cmdline.exp unit-tests/var-class-cmdline.mk unit-tests/var-class-env.exp unit-tests/var-class-env.mk unit-tests/var-class-global.exp unit-tests/var-class-global.mk unit-tests/var-class-local-legacy.exp unit-tests/var-class-local-legacy.mk unit-tests/var-class-local.exp unit-tests/var-class-local.mk unit-tests/var-class.exp unit-tests/var-class.mk unit-tests/var-op-append.exp unit-tests/var-op-append.mk unit-tests/var-op-assign.exp unit-tests/var-op-assign.mk unit-tests/var-op-default.exp unit-tests/var-op-default.mk unit-tests/var-op-expand.exp unit-tests/var-op-expand.mk unit-tests/var-op-shell.exp unit-tests/var-op-shell.mk unit-tests/var-op-sunsh.exp unit-tests/var-op-sunsh.mk unit-tests/var-op.exp unit-tests/var-op.mk unit-tests/var-recursive.exp unit-tests/var-recursive.mk unit-tests/varcmd.exp unit-tests/varcmd.mk unit-tests/vardebug.exp unit-tests/vardebug.mk unit-tests/varfind.exp unit-tests/varfind.mk unit-tests/varmisc.exp unit-tests/varmisc.mk unit-tests/varmod-assign.exp unit-tests/varmod-assign.mk unit-tests/varmod-defined.exp unit-tests/varmod-defined.mk unit-tests/varmod-edge.exp unit-tests/varmod-edge.mk unit-tests/varmod-exclam-shell.exp unit-tests/varmod-exclam-shell.mk unit-tests/varmod-extension.exp unit-tests/varmod-extension.mk unit-tests/varmod-gmtime.exp unit-tests/varmod-gmtime.mk unit-tests/varmod-hash.exp unit-tests/varmod-hash.mk unit-tests/varmod-head.exp unit-tests/varmod-head.mk unit-tests/varmod-ifelse.exp unit-tests/varmod-ifelse.mk +unit-tests/varmod-indirect.exp +unit-tests/varmod-indirect.mk unit-tests/varmod-l-name-to-value.exp unit-tests/varmod-l-name-to-value.mk unit-tests/varmod-localtime.exp unit-tests/varmod-localtime.mk unit-tests/varmod-loop.exp unit-tests/varmod-loop.mk unit-tests/varmod-match-escape.exp unit-tests/varmod-match-escape.mk unit-tests/varmod-match.exp unit-tests/varmod-match.mk unit-tests/varmod-no-match.exp unit-tests/varmod-no-match.mk unit-tests/varmod-order-reverse.exp unit-tests/varmod-order-reverse.mk unit-tests/varmod-order-shuffle.exp unit-tests/varmod-order-shuffle.mk unit-tests/varmod-order.exp unit-tests/varmod-order.mk unit-tests/varmod-path.exp unit-tests/varmod-path.mk unit-tests/varmod-quote-dollar.exp unit-tests/varmod-quote-dollar.mk unit-tests/varmod-quote.exp unit-tests/varmod-quote.mk unit-tests/varmod-range.exp unit-tests/varmod-range.mk unit-tests/varmod-remember.exp unit-tests/varmod-remember.mk unit-tests/varmod-root.exp unit-tests/varmod-root.mk unit-tests/varmod-select-words.exp unit-tests/varmod-select-words.mk unit-tests/varmod-shell.exp unit-tests/varmod-shell.mk unit-tests/varmod-subst-regex.exp unit-tests/varmod-subst-regex.mk unit-tests/varmod-subst.exp unit-tests/varmod-subst.mk unit-tests/varmod-sysv.exp unit-tests/varmod-sysv.mk unit-tests/varmod-tail.exp unit-tests/varmod-tail.mk unit-tests/varmod-to-abs.exp unit-tests/varmod-to-abs.mk unit-tests/varmod-to-lower.exp unit-tests/varmod-to-lower.mk unit-tests/varmod-to-many-words.exp unit-tests/varmod-to-many-words.mk unit-tests/varmod-to-one-word.exp unit-tests/varmod-to-one-word.mk unit-tests/varmod-to-separator.exp unit-tests/varmod-to-separator.mk unit-tests/varmod-to-upper.exp unit-tests/varmod-to-upper.mk unit-tests/varmod-undefined.exp unit-tests/varmod-undefined.mk unit-tests/varmod-unique.exp unit-tests/varmod-unique.mk unit-tests/varmod.exp unit-tests/varmod.mk unit-tests/varname-dollar.exp unit-tests/varname-dollar.mk unit-tests/varname-dot-alltargets.exp unit-tests/varname-dot-alltargets.mk unit-tests/varname-dot-curdir.exp unit-tests/varname-dot-curdir.mk unit-tests/varname-dot-includedfromdir.exp unit-tests/varname-dot-includedfromdir.mk unit-tests/varname-dot-includedfromfile.exp unit-tests/varname-dot-includedfromfile.mk unit-tests/varname-dot-includes.exp unit-tests/varname-dot-includes.mk unit-tests/varname-dot-libs.exp unit-tests/varname-dot-libs.mk unit-tests/varname-dot-make-dependfile.exp unit-tests/varname-dot-make-dependfile.mk unit-tests/varname-dot-make-expand_variables.exp unit-tests/varname-dot-make-expand_variables.mk unit-tests/varname-dot-make-exported.exp unit-tests/varname-dot-make-exported.mk unit-tests/varname-dot-make-jobs-prefix.exp unit-tests/varname-dot-make-jobs-prefix.mk unit-tests/varname-dot-make-jobs.exp unit-tests/varname-dot-make-jobs.mk unit-tests/varname-dot-make-level.exp unit-tests/varname-dot-make-level.mk unit-tests/varname-dot-make-makefile_preference.exp unit-tests/varname-dot-make-makefile_preference.mk unit-tests/varname-dot-make-makefiles.exp unit-tests/varname-dot-make-makefiles.mk unit-tests/varname-dot-make-meta-bailiwick.exp unit-tests/varname-dot-make-meta-bailiwick.mk unit-tests/varname-dot-make-meta-created.exp unit-tests/varname-dot-make-meta-created.mk unit-tests/varname-dot-make-meta-files.exp unit-tests/varname-dot-make-meta-files.mk unit-tests/varname-dot-make-meta-ignore_filter.exp unit-tests/varname-dot-make-meta-ignore_filter.mk unit-tests/varname-dot-make-meta-ignore_paths.exp unit-tests/varname-dot-make-meta-ignore_paths.mk unit-tests/varname-dot-make-meta-ignore_patterns.exp unit-tests/varname-dot-make-meta-ignore_patterns.mk unit-tests/varname-dot-make-meta-prefix.exp unit-tests/varname-dot-make-meta-prefix.mk unit-tests/varname-dot-make-mode.exp unit-tests/varname-dot-make-mode.mk unit-tests/varname-dot-make-path_filemon.exp unit-tests/varname-dot-make-path_filemon.mk unit-tests/varname-dot-make-pid.exp unit-tests/varname-dot-make-pid.mk unit-tests/varname-dot-make-ppid.exp unit-tests/varname-dot-make-ppid.mk unit-tests/varname-dot-make-save_dollars.exp unit-tests/varname-dot-make-save_dollars.mk +unit-tests/varname-dot-makeflags.exp +unit-tests/varname-dot-makeflags.mk unit-tests/varname-dot-makeoverrides.exp unit-tests/varname-dot-makeoverrides.mk unit-tests/varname-dot-newline.exp unit-tests/varname-dot-newline.mk unit-tests/varname-dot-objdir.exp unit-tests/varname-dot-objdir.mk unit-tests/varname-dot-parsedir.exp unit-tests/varname-dot-parsedir.mk unit-tests/varname-dot-parsefile.exp unit-tests/varname-dot-parsefile.mk unit-tests/varname-dot-path.exp unit-tests/varname-dot-path.mk unit-tests/varname-dot-shell.exp unit-tests/varname-dot-shell.mk unit-tests/varname-dot-targets.exp unit-tests/varname-dot-targets.mk unit-tests/varname-empty.exp unit-tests/varname-empty.mk unit-tests/varname-make.exp unit-tests/varname-make.mk unit-tests/varname-make_print_var_on_error-jobs.exp unit-tests/varname-make_print_var_on_error-jobs.mk unit-tests/varname-make_print_var_on_error.exp unit-tests/varname-make_print_var_on_error.mk unit-tests/varname-makefile.exp unit-tests/varname-makefile.mk unit-tests/varname-makeflags.exp unit-tests/varname-makeflags.mk unit-tests/varname-pwd.exp unit-tests/varname-pwd.mk unit-tests/varname-vpath.exp unit-tests/varname-vpath.mk unit-tests/varname.exp unit-tests/varname.mk unit-tests/varparse-dynamic.exp unit-tests/varparse-dynamic.mk unit-tests/varparse-errors.exp unit-tests/varparse-errors.mk unit-tests/varparse-mod.exp unit-tests/varparse-mod.mk unit-tests/varparse-undef-partial.exp unit-tests/varparse-undef-partial.mk unit-tests/varquote.exp unit-tests/varquote.mk util.c var.c wait.h diff --git a/LICENSE b/LICENSE index 283dd20cccd0..0d460e91d230 100644 --- a/LICENSE +++ b/LICENSE @@ -1,60 +1,60 @@ The individual files in this distribution are copyright their original contributors or assignees. Including: - Copyright (c) 1993-2020, Simon J Gerraty + Copyright (c) 1993-2021, Simon J Gerraty Copyright (c) 2020, Roland Illig Copyright (c) 2009-2016, Juniper Networks, Inc. Copyright (c) 2009, John Birrell. - Copyright (c) 1997-2020 The NetBSD Foundation, Inc. + Copyright (c) 1997-2021 The NetBSD Foundation, Inc. Copyright (c) 1998 Todd C. Miller Copyright (c) 1989 by Berkeley Softworks Copyright (c) 1988, 1989, 1990, 1992, 1993 The Regents of the University of California. Copyright (c) 1988, 1989 by Adam de Boor With the exception of the GNU configure script, which states: # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. The license for this distribution is considered to be: SPDX-License-Identifier: BSD-3-Clause example (from https://opensource.org/licenses/BSD-3-Clause): Copyright Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/PSD.doc/tutorial.ms b/PSD.doc/tutorial.ms index 814a09a62146..da17f950f2b5 100644 --- a/PSD.doc/tutorial.ms +++ b/PSD.doc/tutorial.ms @@ -1,3794 +1,3794 @@ -.\" $NetBSD: tutorial.ms,v 1.13 2017/03/01 13:05:11 kre Exp $ +.\" $NetBSD: tutorial.ms,v 1.14 2020/12/18 15:47:34 rillig Exp $ .\" Copyright (c) 1988, 1989, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" Adam de Boor. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" Copyright (c) 1988, 1989 by Adam de Boor .\" Copyright (c) 1989 by Berkeley Softworks .\" .\" This code is derived from software contributed to Berkeley by .\" Adam de Boor. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)tutorial.ms 8.1 (Berkeley) 8/18/93 .\" .EH 'PSD:12-%''PMake \*- A Tutorial' .OH 'PMake \*- A Tutorial''PSD:12-%' .\" Ix is an indexing macro similar to .IX but I've disabled it for now .\" Since that would require 2 passes and I am not in the mood for that. .de Ix .. .\" Rd is section (region) define and Rm is region mention? Again disable for .\" now. .de Rd .. .de Rm .. .\" xH is a macro to provide numbered headers that are automatically stuffed .\" into a table-of-contents, properly indented, etc. If the first argument .\" is numeric, it is taken as the depth for numbering (as for .NH), else .\" the default (1) is assumed. .\" .\" @P The initial paragraph distance. .\" @Q The piece of section number to increment (or 0 if none given) .\" @R Section header. .\" @S Indent for toc entry .\" @T Argument to NH (can't use @Q b/c giving 0 to NH resets the counter) .de xH .NH \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 .nr PD .1v .XS \\n% .ta 0.6i \\*(SN \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9 .XE .nr PD .3v .. .\" CW is used to place a string in fixed-width or switch to a .\" fixed-width font. .\" C is a typewriter font for a laserwriter. Use something else if .\" you don't have one... .de CW .ie !\\n(.$ .ft C .el \&\\$3\fC\\$1\fP\\$2 .. .\" Anything I put in a display I want to be in fixed-width .am DS .CW .. .\" The stuff in .No produces a little stop sign in the left margin .\" that says NOTE in it. Unfortunately, it does cause a break, but .\" hey. Can't have everything. In case you're wondering how I came .\" up with such weird commands, they came from running grn on a .\" gremlin file... .de No .br .ne 0.5i .ie n \{\ .nr g3 \w'NOTE ' .po -\\n(g3u .br NOTE .br .po +\\n(g3u .\} .el \{\ .po -0.5i .br .mk .nr g3 \\n(.f .nr g4 \\n(.s .sp -1 .\" .st cf \D't 5u' .sp -1 \h'50u' .sp -1 \D't 3u' .sp -1 .sp 7u \h'53u' \d\D'p -0.19i 0.0i 0.0i -0.13i 0.30i 0.0i 0.0i 0.13i' .sp -1 .ft R .ps 6 .nr g8 \\n(.d .ds g9 "NOTE .sp 74u \h'85u'\v'0.85n'\h-\w\\*(g9u/2u\&\\*(g9 .sp |\\n(g8u .sp 166u \D't 3u' .br .po .rt .ft \\n(g3 .ps \\n(g4 .\} .. .de Bp .ie !\\n(.$ .IP \(bu 2 .el .IP "\&" 2 .. .ie n .po +\w'NOTE 'u .el .po +.3i .TL PMake \*- A Tutorial .AU Adam de Boor .AI Berkeley Softworks 2150 Shattuck Ave, Penthouse Berkeley, CA 94704 adam@bsw.uu.net \&...!uunet!bsw!adam .FS Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies. The University of California, Berkeley Softworks, and Adam de Boor make no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. .FE .PP .xH 1 Introduction .LP PMake is a program for creating other programs, or anything else you can think of for it to do. The basic idea behind PMake is that, for any given system, be it a program or a document or whatever, there will be some files that depend on the state of other files (on when they were last modified). PMake takes these dependencies, which you must specify, and uses them to build whatever it is you want it to build. .LP PMake is almost fully-compatible with Make, with which you may already be familiar. PMake's most important feature is its ability to run several different jobs at once, making the creation of systems considerably faster. It also has a great deal more functionality than Make. Throughout the text, whenever something is mentioned that is an important difference between PMake and Make (i.e. something that will cause a makefile to fail if you don't do something about it), or is simply important, it will be flagged with a little sign in the left margin, like this: .No .LP This tutorial is divided into three main sections corresponding to basic, intermediate and advanced PMake usage. If you already know Make well, you will only need to skim chapter 2 (there are some aspects of PMake that I consider basic to its use that didn't exist in Make). Things in chapter 3 make life much easier, while those in chapter 4 are strictly for those who know what they are doing. Chapter 5 has definitions for the jargon I use and chapter 6 contains possible solutions to the problems presented throughout the tutorial. .xH 1 The Basics of PMake .LP PMake takes as input a file that tells a) which files depend on which other files to be complete and b) what to do about files that are ``out-of-date.'' This file is known as a ``makefile'' and is usually .Ix 0 def makefile kept in the top-most directory of the system to be built. While you can call the makefile anything you want, PMake will look for .CW Makefile and .CW makefile (in that order) in the current directory if you don't tell it otherwise. .Ix 0 def makefile default To specify a different makefile, use the .B \-f flag (e.g. .CW "pmake -f program.mk" ''). `` .Ix 0 ref flags -f .Ix 0 ref makefile other .LP A makefile has four different types of lines in it: .RS .IP \(bu 2 File dependency specifications .IP \(bu 2 Creation commands .IP \(bu 2 Variable assignments .IP \(bu 2 Comments, include statements and conditional directives .RE .LP Any line may be continued over multiple lines by ending it with a backslash. .Ix 0 def "continuation line" The backslash, following newline and any initial whitespace on the following line are compressed into a single space before the input line is examined by PMake. .xH 2 Dependency Lines .LP As mentioned in the introduction, in any system, there are dependencies between the files that make up the system. For instance, in a program made up of several C source files and one header file, the C files will need to be re-compiled should the header file be changed. For a document of several chapters and one macro file, the chapters will need to be reprocessed if any of the macros changes. .Ix 0 def "dependency" These are dependencies and are specified by means of dependency lines in the makefile. .LP .Ix 0 def "dependency line" On a dependency line, there are targets and sources, separated by a one- or two-character operator. The targets ``depend'' on the sources and are usually created from them. .Ix 0 def target .Ix 0 def source .Ix 0 ref operator Any number of targets and sources may be specified on a dependency line. All the targets in the line are made to depend on all the sources. Targets and sources need not be actual files, but every source must be either an actual file or another target in the makefile. If you run out of room, use a backslash at the end of the line to continue onto the next one. .LP Any file may be a target and any file may be a source, but the relationship between the two (or however many) is determined by the ``operator'' that separates them. .Ix 0 def operator Three types of operators exist: one specifies that the datedness of a target is determined by the state of its sources, while another specifies other files (the sources) that need to be dealt with before the target can be re-created. The third operator is very similar to the first, with the additional condition that the target is out-of-date if it has no sources. These operations are represented by the colon, the exclamation point and the double-colon, respectively, and are mutually exclusive. Their exact semantics are as follows: .IP ":" .Ix 0 def operator colon .Ix 0 def : If a colon is used, a target on the line is considered to be ``out-of-date'' (and in need of creation) if .RS .IP \(bu 2 any of the sources has been modified more recently than the target, or .IP \(bu 2 the target doesn't exist. .RE .Ix 0 def out-of-date .IP "\&" Under this operation, steps will be taken to re-create the target only if it is found to be out-of-date by using these two rules. .IP "!" .Ix 0 def operator force .Ix 0 def ! If an exclamation point is used, the target will always be re-created, but this will not happen until all of its sources have been examined and re-created, if necessary. .IP "::" .Ix 0 def operator double-colon .Ix 0 def :: If a double-colon is used, a target is out-of-date if: .RS .IP \(bu 2 any of the sources has been modified more recently than the target, or .IP \(bu 2 the target doesn't exist, or .IP \(bu 2 the target has no sources. .RE .IP "\&" If the target is out-of-date according to these rules, it will be re-created. This operator also does something else to the targets, but I'll go into that in the next section (``Shell Commands''). .LP Enough words, now for an example. Take that C program I mentioned earlier. Say there are three C files .CW a.c , ( .CW b.c and .CW c.c ) each of which includes the file .CW defs.h . The dependencies between the files could then be expressed as follows: .DS program : a.o b.o c.o a.o b.o c.o : defs.h a.o : a.c b.o : b.c c.o : c.c .DE .LP You may be wondering at this point, where .CW a.o , .CW b.o and .CW c.o came in and why .I they depend on .CW defs.h and the C files don't. The reason is quite simple: .CW program cannot be made by linking together .c files \*- it must be made from .o files. Likewise, if you change .CW defs.h , it isn't the .c files that need to be re-created, it's the .o files. If you think of dependencies in these terms \*- which files (targets) need to be created from which files (sources) \*- you should have no problems. .LP An important thing to notice about the above example, is that all the \&.o files appear as targets on more than one line. This is perfectly all right: the target is made to depend on all the sources mentioned on all the dependency lines. E.g. .CW a.o depends on both .CW defs.h and .CW a.c . .Ix 0 ref dependency .No .LP The order of the dependency lines in the makefile is important: the first target on the first dependency line in the makefile will be the one that gets made if you don't say otherwise. That's why .CW program comes first in the example makefile, above. .LP Both targets and sources may contain the standard C-Shell wildcard characters .CW { , ( .CW } , .CW * , .CW ? , .CW [ , and .CW ] ), but the non-curly-brace ones may only appear in the final component (the file portion) of the target or source. The characters mean the following things: .IP \fB{}\fP These enclose a comma-separated list of options and cause the pattern to be expanded once for each element of the list. Each expansion contains a different element. For example, .CW src/{whiffle,beep,fish}.c expands to the three words .CW src/whiffle.c , .CW src/beep.c , and .CW src/fish.c . These braces may be nested and, unlike the other wildcard characters, the resulting words need not be actual files. All other wildcard characters are expanded using the files that exist when PMake is started. .IP \fB*\fP This matches zero or more characters of any sort. .CW src/*.c will expand to the same three words as above as long as .CW src contains those three files (and no other files that end in .CW .c ). .IP \fB?\fP Matches any single character. .IP \fB[]\fP This is known as a character class and contains either a list of single characters, or a series of character ranges .CW a-z , ( for example means all characters between a and z), or both. It matches any single character contained in the list. E.g. .CW [A-Za-z] will match all letters, while .CW [0123456789] will match all numbers. .xH 2 Shell Commands .LP ``Isn't that nice,'' you say to yourself, ``but how are files actually `re-created,' as he likes to spell it?'' The re-creation is accomplished by commands you place in the makefile. These commands are passed to the Bourne shell (better known as ``/bin/sh'') to be executed and are .Ix 0 ref shell .Ix 0 ref re-creation .Ix 0 ref update expected to do what's necessary to update the target file (PMake doesn't actually check to see if the target was created. It just assumes it's there). .Ix 0 ref target .LP Shell commands in a makefile look a lot like shell commands you would type at a terminal, with one important exception: each command in a makefile .I must be preceded by at least one tab. .LP Each target has associated with it a shell script made up of one or more of these shell commands. The creation script for a target should immediately follow the dependency line for that target. While any given target may appear on more than one dependency line, only one of these dependency lines may be followed by a creation script, unless the `::' operator was used on the dependency line. .Ix 0 ref operator double-colon .Ix 0 ref :: .No .LP If the double-colon was used, each dependency line for the target may be followed by a shell script. That script will only be executed if the target on the associated dependency line is out-of-date with respect to the sources on that line, according to the rules I gave earlier. I'll give you a good example of this later on. .LP To expand on the earlier makefile, you might add commands as follows: .DS program : a.o b.o c.o cc a.o b.o c.o \-o program a.o b.o c.o : defs.h a.o : a.c cc \-c a.c b.o : b.c cc \-c b.c c.o : c.c cc \-c c.c .DE .LP Something you should remember when writing a makefile is, the commands will be executed if the .I target on the dependency line is out-of-date, not the sources. .Ix 0 ref target .Ix 0 ref source .Ix 0 ref out-of-date In this example, the command .CW "cc \-c a.c" '' `` will be executed if .CW a.o is out-of-date. Because of the `:' operator, .Ix 0 ref : .Ix 0 ref operator colon this means that should .CW a.c .I or .CW defs.h have been modified more recently than .CW a.o , the command will be executed .CW a.o "\&" ( will be considered out-of-date). .Ix 0 ref out-of-date .LP Remember how I said the only difference between a makefile shell command and a regular shell command was the leading tab? I lied. There is another way in which makefile commands differ from regular ones. The first two characters after the initial whitespace are treated specially. If they are any combination of `@' and `\-', they cause PMake to do different things. .LP In most cases, shell commands are printed before they're actually executed. This is to keep you informed of what's going on. If an `@' appears, however, this echoing is suppressed. In the case of an .CW echo command, say .CW "echo Linking index" ,'' `` it would be rather silly to see .DS echo Linking index Linking index .DE .LP so PMake allows you to place an `@' before the command .CW "@echo Linking index" '') (`` to prevent the command from being printed. .LP The other special character is the `\-'. In case you didn't know, shell commands finish with a certain ``exit status.'' This status is made available by the operating system to whatever program invoked the command. Normally this status will be 0 if everything went ok and non-zero if something went wrong. For this reason, PMake will consider an error to have occurred if one of the shells it invokes returns a non-zero status. When it detects an error, PMake's usual action is to abort whatever it's doing and exit with a non-zero status itself (any other targets that were being created will continue being made, but nothing new will be started. PMake will exit after the last job finishes). This behavior can be altered, however, by placing a `\-' at the front of a command .CW "\-mv index index.old" ''), (`` certain command-line arguments, or doing other things, to be detailed later. In such a case, the non-zero status is simply ignored and PMake keeps chugging along. .No .LP Because all the commands are given to a single shell to execute, such things as setting shell variables, changing directories, etc., last beyond the command in which they are found. This also allows shell compound commands (like .CW for loops) to be entered in a natural manner. Since this could cause problems for some makefiles that depend on each command being executed by a single shell, PMake has a .B \-B .Ix 0 ref compatibility .Ix 0 ref flags -B flag (it stands for backwards-compatible) that forces each command to be given to a separate shell. It also does several other things, all of which I discourage since they are now old-fashioned.\|.\|.\|. .No .LP A target's shell script is fed to the shell on its (the shell's) input stream. This means that any commands, such as .CW ci that need to get input from the terminal won't work right \*- they'll get the shell's input, something they probably won't find to their liking. A simple way around this is to give a command like this: .DS ci $(SRCS) < /dev/tty .DE This would force the program's input to come from the terminal. If you can't do this for some reason, your only other alternative is to use PMake in its fullest compatibility mode. See .B Compatibility in chapter 4. .Ix 0 ref compatibility .LP .xH 2 Variables .LP PMake, like Make before it, has the ability to save text in variables to be recalled later at your convenience. Variables in PMake are used much like variables in the shell and, by tradition, consist of all upper-case letters (you don't .I have to use all upper-case letters. In fact there's nothing to stop you from calling a variable .CW @^&$%$ . Just tradition). Variables are assigned-to using lines of the form .Ix 0 def variable assignment .DS VARIABLE = value .DE .Ix 0 def variable assignment appended-to by .DS VARIABLE += value .DE .Ix 0 def variable appending .Ix 0 def variable assignment appended .Ix 0 def += conditionally assigned-to (if the variable isn't already defined) by .DS VARIABLE ?= value .DE .Ix 0 def variable assignment conditional .Ix 0 def ?= and assigned-to with expansion (i.e. the value is expanded (see below) before being assigned to the variable\*-useful for placing a value at the beginning of a variable, or other things) by .DS VARIABLE := value .DE .Ix 0 def variable assignment expanded .Ix 0 def := .LP Any whitespace before .I value is stripped off. When appending, a space is placed between the old value and the stuff being appended. .LP The final way a variable may be assigned to is using .DS VARIABLE != shell-command .DE .Ix 0 def variable assignment shell-output .Ix 0 def != In this case, .I shell-command has all its variables expanded (see below) and is passed off to a shell to execute. The output of the shell is then placed in the variable. Any newlines (other than the final one) are replaced by spaces before the assignment is made. This is typically used to find the current directory via a line like: .DS CWD != pwd .DE .LP .B Note: this is intended to be used to execute commands that produce small amounts of output (e.g. ``pwd''). The implementation is less than intelligent and will likely freeze if you execute something that produces thousands of bytes of output (8 Kb is the limit on many UNIX systems). .LP The value of a variable may be retrieved by enclosing the variable name in parentheses or curly braces and preceding the whole thing with a dollar sign. .LP For example, to set the variable CFLAGS to the string .CW "\-I/sprite/src/lib/libc \-O" ,'' `` you would place a line .DS CFLAGS = \-I/sprite/src/lib/libc \-O .DE in the makefile and use the word .CW "$(CFLAGS)" wherever you would like the string .CW "\-I/sprite/src/lib/libc \-O" to appear. This is called variable expansion. .Ix 0 def variable expansion .No .LP Unlike Make, PMake will not expand a variable unless it knows the variable exists. E.g. if you have a .CW "${i}" in a shell command and you have not assigned a value to the variable .CW i (the empty string is considered a value, by the way), where Make would have substituted the empty string, PMake will leave the .CW "${i}" alone. To keep PMake from substituting for a variable it knows, precede the dollar sign with another dollar sign. (e.g. to pass .CW "${HOME}" to the shell, use .CW "$${HOME}" ). This causes PMake, in effect, to expand the .CW $ macro, which expands to a single .CW $ . For compatibility, Make's style of variable expansion will be used if you invoke PMake with any of the compatibility flags (\c .B \-V , .B \-B or .B \-M . The .B \-V flag alters just the variable expansion). .Ix 0 ref flags -V .Ix 0 ref flags -B .Ix 0 ref flags -M .Ix 0 ref compatibility .LP .Ix 0 ref variable expansion There are two different times at which variable expansion occurs: When parsing a dependency line, the expansion occurs immediately upon reading the line. If any variable used on a dependency line is undefined, PMake will print a message and exit. Variables in shell commands are expanded when the command is executed. Variables used inside another variable are expanded whenever the outer variable is expanded (the expansion of an inner variable has no effect on the outer variable. I.e. if the outer variable is used on a dependency line and in a shell command, and the inner variable changes value between when the dependency line is read and the shell command is executed, two different values will be substituted for the outer variable). .Ix 0 def variable types .LP Variables come in four flavors, though they are all expanded the same and all look about the same. They are (in order of expanding scope): .RS .IP \(bu 2 Local variables. .Ix 0 ref variable local .IP \(bu 2 Command-line variables. .Ix 0 ref variable command-line .IP \(bu 2 Global variables. .Ix 0 ref variable global .IP \(bu 2 Environment variables. .Ix 0 ref variable environment .RE .LP The classification of variables doesn't matter much, except that the classes are searched from the top (local) to the bottom (environment) when looking up a variable. The first one found wins. .xH 3 Local Variables .LP .Ix 0 def variable local Each target can have as many as seven local variables. These are variables that are only ``visible'' within that target's shell script and contain such things as the target's name, all of its sources (from all its dependency lines), those sources that were out-of-date, etc. Four local variables are defined for all targets. They are: .RS .IP ".TARGET" .Ix 0 def variable local .TARGET .Ix 0 def .TARGET The name of the target. .IP ".OODATE" .Ix 0 def variable local .OODATE .Ix 0 def .OODATE The list of the sources for the target that were considered out-of-date. The order in the list is not guaranteed to be the same as the order in which the dependencies were given. .IP ".ALLSRC" .Ix 0 def variable local .ALLSRC .Ix 0 def .ALLSRC The list of all sources for this target in the order in which they were given. .IP ".PREFIX" .Ix 0 def variable local .PREFIX .Ix 0 def .PREFIX The target without its suffix and without any leading path. E.g. for the target .CW ../../lib/compat/fsRead.c , this variable would contain .CW fsRead . .RE .LP Three other local variables are set only for certain targets under special circumstances. These are the ``.IMPSRC,'' .Ix 0 ref variable local .IMPSRC .Ix 0 ref .IMPSRC ``.ARCHIVE,'' .Ix 0 ref variable local .ARCHIVE .Ix 0 ref .ARCHIVE and ``.MEMBER'' .Ix 0 ref variable local .MEMBER .Ix 0 ref .MEMBER variables. When they are set and how they are used is described later. .LP Four of these variables may be used in sources as well as in shell scripts. .Ix 0 def "dynamic source" .Ix 0 def source dynamic These are ``.TARGET'', ``.PREFIX'', ``.ARCHIVE'' and ``.MEMBER''. The variables in the sources are expanded once for each target on the dependency line, providing what is known as a ``dynamic source,'' .Rd 0 allowing you to specify several dependency lines at once. For example, .DS $(OBJS) : $(.PREFIX).c .DE will create a dependency between each object file and its corresponding C source file. .xH 3 Command-line Variables .LP .Ix 0 def variable command-line Command-line variables are set when PMake is first invoked by giving a variable assignment as one of the arguments. For example, .DS pmake "CFLAGS = -I/sprite/src/lib/libc -O" .DE would make .CW CFLAGS be a command-line variable with the given value. Any assignments to .CW CFLAGS in the makefile will have no effect, because once it is set, there is (almost) nothing you can do to change a command-line variable (the search order, you see). Command-line variables may be set using any of the four assignment operators, though only .CW = and .CW ?= behave as you would expect them to, mostly because assignments to command-line variables are performed before the makefile is read, thus the values set in the makefile are unavailable at the time. .CW += .Ix 0 ref += .Ix 0 ref variable assignment appended is the same as .CW = , because the old value of the variable is sought only in the scope in which the assignment is taking place (for reasons of efficiency that I won't get into here). .CW := and .CW ?= .Ix 0 ref := .Ix 0 ref ?= .Ix 0 ref variable assignment expanded .Ix 0 ref variable assignment conditional will work if the only variables used are in the environment. .CW != is sort of pointless to use from the command line, since the same effect can no doubt be accomplished using the shell's own command substitution mechanisms (backquotes and all that). .xH 3 Global Variables .LP .Ix 0 def variable global Global variables are those set or appended-to in the makefile. There are two classes of global variables: those you set and those PMake sets. As I said before, the ones you set can have any name you want them to have, except they may not contain a colon or an exclamation point. The variables PMake sets (almost) always begin with a period and always contain upper-case letters, only. The variables are as follows: .RS .IP .PMAKE .Ix 0 def variable global .PMAKE .Ix 0 def .PMAKE .Ix 0 def variable global MAKE .Ix 0 def MAKE The name by which PMake was invoked is stored in this variable. For compatibility, the name is also stored in the MAKE variable. .IP .MAKEFLAGS .Ix 0 def variable global .MAKEFLAGS .Ix 0 def .MAKEFLAGS variable .Ix 0 def variable global MFLAGS .Ix 0 def MFLAGS All the relevant flags with which PMake was invoked. This does not include such things as .B \-f or variable assignments. Again for compatibility, this value is stored in the MFLAGS variable as well. .RE .LP Two other variables, ``.INCLUDES'' and ``.LIBS,'' are covered in the section on special targets in chapter 3. .Ix 0 ref variable global .INCLUDES .Ix 0 ref variable global .LIBS .LP Global variables may be deleted using lines of the form: .Ix 0 def #undef .Ix 0 def variable deletion .DS #undef \fIvariable\fP .DE The .CW # ' ` must be the first character on the line. Note that this may only be done on global variables. .xH 3 Environment Variables .LP .Ix 0 def variable environment Environment variables are passed by the shell that invoked PMake and are given by PMake to each shell it invokes. They are expanded like any other variable, but they cannot be altered in any way. .LP One special environment variable, .CW PMAKE , .Ix 0 def variable environment PMAKE is examined by PMake for command-line flags, variable assignments, etc., it should always use. This variable is examined before the actual arguments to PMake are. In addition, all flags given to PMake, either through the .CW PMAKE variable or on the command line, are placed in this environment variable and exported to each shell PMake executes. Thus recursive invocations of PMake automatically receive the same flags as the top-most one. .LP Using all these variables, you can compress the sample makefile even more: .DS OBJS = a.o b.o c.o program : $(OBJS) cc $(.ALLSRC) \-o $(.TARGET) $(OBJS) : defs.h a.o : a.c cc \-c a.c b.o : b.c cc \-c b.c c.o : c.c cc \-c c.c .DE .Ix 0 ref variable local .ALLSRC .Ix 0 ref .ALLSRC .Ix 0 ref variable local .TARGET .Ix 0 ref .TARGET .Rd 3 .xH 2 Comments .LP .Ix 0 def comments Comments in a makefile start with a `#' character and extend to the end of the line. They may appear anywhere you want them, except in a shell command (though the shell will treat it as a comment, too). If, for some reason, you need to use the `#' in a variable or on a dependency line, put a backslash in front of it. PMake will compress the two into a single `#' (Note: this isn't true if PMake is operating in full-compatibility mode). .Ix 0 ref flags -M .Ix 0 ref compatibility .xH 2 Parallelism .No .LP PMake was specifically designed to re-create several targets at once, when possible. You do not have to do anything special to cause this to happen (unless PMake was configured to not act in parallel, in which case you will have to make use of the .B \-L and .B \-J flags (see below)), .Ix 0 ref flags -L .Ix 0 ref flags -J but you do have to be careful at times. .LP There are several problems you are likely to encounter. One is that some makefiles (and programs) are written in such a way that it is impossible for two targets to be made at once. The program .CW xstr , for example, always modifies the files .CW strings and .CW x.c . There is no way to change it. Thus you cannot run two of them at once without something being trashed. Similarly, if you have commands in the makefile that always send output to the same file, you will not be able to make more than one target at once unless you change the file you use. You can, for instance, add a .CW $$$$ to the end of the file name to tack on the process ID of the shell executing the command (each .CW $$ expands to a single .CW $ , thus giving you the shell variable .CW $$ ). Since only one shell is used for all the commands, you'll get the same file name for each command in the script. .LP The other problem comes from improperly-specified dependencies that worked in Make because of its sequential, depth-first way of examining them. While I don't want to go into depth on how PMake works (look in chapter 4 if you're interested), I will warn you that files in two different ``levels'' of the dependency tree may be examined in a different order in PMake than they were in Make. For example, given the makefile .DS a : b c b : d .DE PMake will examine the targets in the order .CW c , .CW d , .CW b , .CW a . If the makefile's author expected PMake to abort before making .CW c if an error occurred while making .CW b , or if .CW b needed to exist before .CW c was made, s/he will be sorely disappointed. The dependencies are incomplete, since in both these cases, .CW c would depend on .CW b . So watch out. .LP Another problem you may face is that, while PMake is set up to handle the output from multiple jobs in a graceful fashion, the same is not so for input. It has no way to regulate input to different jobs, so if you use the redirection from .CW /dev/tty I mentioned earlier, you must be careful not to run two of the jobs at once. .xH 2 Writing and Debugging a Makefile .LP Now you know most of what's in a makefile, what do you do next? There are two choices: (1) use one of the uncommonly-available makefile generators or (2) write your own makefile (I leave out the third choice of ignoring PMake and doing everything by hand as being beyond the bounds of common sense). .LP When faced with the writing of a makefile, it is usually best to start from first principles: just what .I are you trying to do? What do you want the makefile finally to produce? .LP To begin with a somewhat traditional example, let's say you need to write a makefile to create a program, .CW expr , that takes standard infix expressions and converts them to prefix form (for no readily apparent reason). You've got three source files, in C, that make up the program: .CW main.c , .CW parse.c , and .CW output.c . Harking back to my pithy advice about dependency lines, you write the first line of the file: .DS expr : main.o parse.o output.o .DE because you remember .CW expr is made from .CW .o files, not .CW .c files. Similarly for the .CW .o files you produce the lines: .DS main.o : main.c parse.o : parse.c output.o : output.c main.o parse.o output.o : defs.h .DE .LP Great. You've now got the dependencies specified. What you need now is commands. These commands, remember, must produce the target on the dependency line, usually by using the sources you've listed. You remember about local variables? Good, so it should come to you as no surprise when you write .DS expr : main.o parse.o output.o cc -o $(.TARGET) $(.ALLSRC) .DE Why use the variables? If your program grows to produce postfix expressions too (which, of course, requires a name change or two), it is one fewer place you have to change the file. You cannot do this for the object files, however, because they depend on their corresponding source files .I and .CW defs.h , thus if you said .DS cc -c $(.ALLSRC) .DE you'd get (for .CW main.o ): .DS cc -c main.c defs.h .DE which is wrong. So you round out the makefile with these lines: .DS main.o : main.c cc -c main.c parse.o : parse.c cc -c parse.c output.o : output.c cc -c output.c .DE .LP The makefile is now complete and will, in fact, create the program you want it to without unnecessary compilations or excessive typing on your part. There are two things wrong with it, however (aside from it being altogether too long, something I'll address in chapter 3): .IP 1) The string .CW "main.o parse.o output.o" '' `` is repeated twice, necessitating two changes when you add postfix (you were planning on that, weren't you?). This is in direct violation of de Boor's First Rule of writing makefiles: .QP .I Anything that needs to be written more than once should be placed in a variable. .IP "\&" I cannot emphasize this enough as being very important to the maintenance of a makefile and its program. .IP 2) There is no way to alter the way compilations are performed short of editing the makefile and making the change in all places. This is evil and violates de Boor's Second Rule, which follows directly from the first: .QP .I Any flags or programs used inside a makefile should be placed in a variable so they may be changed, temporarily or permanently, with the greatest ease. .LP The makefile should more properly read: .DS OBJS = main.o parse.o output.o expr : $(OBJS) $(CC) $(CFLAGS) -o $(.TARGET) $(.ALLSRC) main.o : main.c $(CC) $(CFLAGS) -c main.c parse.o : parse.c $(CC) $(CFLAGS) -c parse.c output.o : output.c $(CC) $(CFLAGS) -c output.c $(OBJS) : defs.h .DE Alternatively, if you like the idea of dynamic sources mentioned in section 2.3.1, .Rm 0 2.3.1 .Rd 4 .Ix 0 ref "dynamic source" .Ix 0 ref source dynamic you could write it like this: .DS OBJS = main.o parse.o output.o expr : $(OBJS) $(CC) $(CFLAGS) -o $(.TARGET) $(.ALLSRC) $(OBJS) : $(.PREFIX).c defs.h $(CC) $(CFLAGS) -c $(.PREFIX).c .DE These two rules and examples lead to de Boor's First Corollary: .QP .I Variables are your friends. .LP Once you've written the makefile comes the sometimes-difficult task of .Ix 0 ref debugging making sure the darn thing works. Your most helpful tool to make sure the makefile is at least syntactically correct is the .B \-n .Ix 0 ref flags -n flag, which allows you to see if PMake will choke on the makefile. The second thing the .B \-n flag lets you do is see what PMake would do without it actually doing it, thus you can make sure the right commands would be executed were you to give PMake its head. .LP When you find your makefile isn't behaving as you hoped, the first question that comes to mind (after ``What time is it, anyway?'') is ``Why not?'' In answering this, two flags will serve you well: .CW "-d m" '' `` .Ix 0 ref flags -d and .CW "-p 2" .'' `` .Ix 0 ref flags -p The first causes PMake to tell you as it examines each target in the makefile and indicate why it is deciding whatever it is deciding. You can then use the information printed for other targets to see where you went wrong. The .CW "-p 2" '' `` flag makes PMake print out its internal state when it is done, allowing you to see that you forgot to make that one chapter depend on that file of macros you just got a new version of. The output from .CW "-p 2" '' `` is intended to resemble closely a real makefile, but with additional information provided and with variables expanded in those commands PMake actually printed or executed. .LP Something to be especially careful about is circular dependencies. .Ix 0 def dependency circular E.g. .DS a : b b : c d d : a .DE In this case, because of how PMake works, .CW c is the only thing PMake will examine, because .CW d and .CW a will effectively fall off the edge of the universe, making it impossible to examine .CW b (or them, for that matter). PMake will tell you (if run in its normal mode) all the targets involved in any cycle it looked at (i.e. if you have two cycles in the graph (naughty, naughty), but only try to make a target in one of them, PMake will only tell you about that one. You'll have to try to make the other to find the second cycle). When run as Make, it will only print the first target in the cycle. .xH 2 Invoking PMake .LP .Ix 0 ref flags .Ix 0 ref arguments .Ix 0 ref usage PMake comes with a wide variety of flags to choose from. They may appear in any order, interspersed with command-line variable assignments and targets to create. The flags are as follows: .IP "\fB\-d\fP \fIwhat\fP" .Ix 0 def flags -d .Ix 0 ref debugging This causes PMake to spew out debugging information that may prove useful to you. If you can't figure out why PMake is doing what it's doing, you might try using this flag. The .I what parameter is a string of single characters that tell PMake what aspects you are interested in. Most of what I describe will make little sense to you, unless you've dealt with Make before. Just remember where this table is and come back to it as you read on. The characters and the information they produce are as follows: .RS .IP a Archive searching and caching. .IP c Conditional evaluation. .IP d The searching and caching of directories. .IP j Various snippets of information related to the running of the multiple shells. Not particularly interesting. .IP m The making of each target: what target is being examined; when it was last modified; whether it is out-of-date; etc. .IP p Makefile parsing. .IP r Remote execution. .IP s The application of suffix-transformation rules. (See chapter 3) .IP t The maintenance of the list of targets. .IP v Variable assignment. .RE .IP "\&" Of these all, the .CW m and .CW s letters will be most useful to you. If the .B \-d is the final argument or the argument from which it would get these key letters (see below for a note about which argument would be used) begins with a .B \- , all of these debugging flags will be set, resulting in massive amounts of output. .IP "\fB\-f\fP \fImakefile\fP" .Ix 0 def flags -f Specify a makefile to read different from the standard makefiles .CW Makefile "\&" ( or .CW makefile ). .Ix 0 ref makefile default .Ix 0 ref makefile other If .I makefile is ``\-'', PMake uses the standard input. This is useful for making quick and dirty makefiles.\|.\|. .Ix 0 ref makefile "quick and dirty" .IP \fB\-h\fP .Ix 0 def flags -h Prints out a summary of the various flags PMake accepts. It can also be used to find out what level of concurrency was compiled into the version of PMake you are using (look at .B \-J and .B \-L ) and various other information on how PMake was configured. .Ix 0 ref configuration .Ix 0 ref makefile system .IP \fB\-i\fP .Ix 0 def flags -i If you give this flag, PMake will ignore non-zero status returned by any of its shells. It's like placing a `\-' before all the commands in the makefile. .IP \fB\-k\fP .Ix 0 def flags -k This is similar to .B \-i in that it allows PMake to continue when it sees an error, but unlike .B \-i , where PMake continues blithely as if nothing went wrong, .B \-k causes it to recognize the error and only continue work on those things that don't depend on the target, either directly or indirectly (through depending on something that depends on it), whose creation returned the error. The `k' is for ``keep going''.\|.\|. .Ix 0 ref target .IP \fB\-l\fP .Ix 0 def flags -l PMake has the ability to lock a directory against other people executing it in the same directory (by means of a file called ``LOCK.make'' that it creates and checks for in the directory). This is a Good Thing because two people doing the same thing in the same place can be disastrous for the final product (too many cooks and all that). Whether this locking is the default is up to your system administrator. If locking is on, .B \-l will turn it off, and vice versa. Note that this locking will not prevent \fIyou\fP from invoking PMake twice in the same place \*- if you own the lock file, PMake will warn you about it but continue to execute. .IP "\fB\-m\fP \fIdirectory\fP" .Ix 0 def flags -m Tells PMake another place to search for included makefiles via the <...> style. Several .B \-m options can be given to form a search path. If this construct is used the default system makefile search path is completely overridden. To be explained in chapter 3, section 3.2. .Rm 2 3.2 .IP \fB\-n\fP .Ix 0 def flags -n This flag tells PMake not to execute the commands needed to update the out-of-date targets in the makefile. Rather, PMake will simply print the commands it would have executed and exit. This is particularly useful for checking the correctness of a makefile. If PMake doesn't do what you expect it to, it's a good chance the makefile is wrong. .IP "\fB\-p\fP \fInumber\fP" .Ix 0 def flags -p .Ix 0 ref debugging This causes PMake to print its input in a reasonable form, though not necessarily one that would make immediate sense to anyone but me. The .I number is a bitwise-or of 1 and 2 where 1 means it should print the input before doing any processing and 2 says it should print it after everything has been re-created. Thus .CW "\-p 3" would print it twice\*-once before processing and once after (you might find the difference between the two interesting). This is mostly useful to me, but you may find it informative in some bizarre circumstances. .IP \fB\-q\fP .Ix 0 def flags -q If you give PMake this flag, it will not try to re-create anything. It will just see if anything is out-of-date and exit non-zero if so. .IP \fB\-r\fP .Ix 0 def flags -r When PMake starts up, it reads a default makefile that tells it what sort of system it's on and gives it some idea of what to do if you don't tell it anything. I'll tell you about it in chapter 3. If you give this flag, PMake won't read the default makefile. .IP \fB\-s\fP .Ix 0 def flags -s This causes PMake to not print commands before they're executed. It is the equivalent of putting an `@' before every command in the makefile. .IP \fB\-t\fP .Ix 0 def flags -t Rather than try to re-create a target, PMake will simply ``touch'' it so as to make it appear up-to-date. If the target didn't exist before, it will when PMake finishes, but if the target did exist, it will appear to have been updated. .IP \fB\-v\fP .Ix 0 def flags -v This is a mixed-compatibility flag intended to mimic the System V version of Make. It is the same as giving .B \-B , and .B \-V as well as turning off directory locking. Targets can still be created in parallel, however. This is the mode PMake will enter if it is invoked either as .CW smake '' `` or .CW vmake ''. `` .IP \fB\-x\fP .Ix 0 def flags -x This tells PMake it's ok to export jobs to other machines, if they're available. It is used when running in Make mode, as exporting in this mode tends to make things run slower than if the commands were just executed locally. .IP \fB\-B\fP .Ix 0 ref compatibility .Ix 0 def flags -B Forces PMake to be as backwards-compatible with Make as possible while still being itself. This includes: .RS .IP \(bu 2 Executing one shell per shell command .IP \(bu 2 Expanding anything that looks even vaguely like a variable, with the empty string replacing any variable PMake doesn't know. .IP \(bu 2 Refusing to allow you to escape a `#' with a backslash. .IP \(bu 2 Permitting undefined variables on dependency lines and conditionals (see below). Normally this causes PMake to abort. .RE .IP \fB\-C\fP .Ix 0 def flags -C This nullifies any and all compatibility mode flags you may have given or implied up to the time the .B \-C is encountered. It is useful mostly in a makefile that you wrote for PMake to avoid bad things happening when someone runs PMake as .CW make '' `` or has things set in the environment that tell it to be compatible. .B \-C is .I not placed in the .CW PMAKE environment variable or the .CW .MAKEFLAGS or .CW MFLAGS global variables. .Ix 0 ref variable environment PMAKE .Ix 0 ref variable global .MAKEFLAGS .Ix 0 ref variable global MFLAGS .Ix 0 ref .MAKEFLAGS variable .Ix 0 ref MFLAGS .IP "\fB\-D\fP \fIvariable\fP" .Ix 0 def flags -D Allows you to define a variable to have .CW 1 '' `` as its value. The variable is a global variable, not a command-line variable. This is useful mostly for people who are used to the C compiler arguments and those using conditionals, which I'll get into in section 4.3 .Rm 1 4.3 .IP "\fB\-I\fP \fIdirectory\fP" .Ix 0 def flags -I Tells PMake another place to search for included makefiles. Yet another thing to be explained in chapter 3 (section 3.2, to be precise). .Rm 2 3.2 .IP "\fB\-J\fP \fInumber\fP" .Ix 0 def flags -J Gives the absolute maximum number of targets to create at once on both local and remote machines. .IP "\fB\-L\fP \fInumber\fP" .Ix 0 def flags -L This specifies the maximum number of targets to create on the local machine at once. This may be 0, though you should be wary of doing this, as PMake may hang until a remote machine becomes available, if one is not available when it is started. .IP \fB\-M\fP .Ix 0 ref compatibility .Ix 0 def flags -M This is the flag that provides absolute, complete, full compatibility with Make. It still allows you to use all but a few of the features of PMake, but it is non-parallel. This is the mode PMake enters if you call it .CW make .'' `` .IP \fB\-P\fP .Ix 0 def flags -P .Ix 0 ref "output control" When creating targets in parallel, several shells are executing at once, each wanting to write its own two cent's-worth to the screen. This output must be captured by PMake in some way in order to prevent the screen from being filled with garbage even more indecipherable than you usually see. PMake has two ways of doing this, one of which provides for much cleaner output and a clear separation between the output of different jobs, the other of which provides a more immediate response so one can tell what is really happening. The former is done by notifying you when the creation of a target starts, capturing the output and transferring it to the screen all at once when the job finishes. The latter is done by catching the output of the shell (and its children) and buffering it until an entire line is received, then printing that line preceded by an indication of which job produced the output. Since I prefer this second method, it is the one used by default. The first method will be used if you give the .B \-P flag to PMake. .IP \fB\-V\fP .Ix 0 def flags -V As mentioned before, the .B \-V flag tells PMake to use Make's style of expanding variables, substituting the empty string for any variable it doesn't know. .IP \fB\-W\fP .Ix 0 def flags -W There are several times when PMake will print a message at you that is only a warning, i.e. it can continue to work in spite of your having done something silly (such as forgotten a leading tab for a shell command). Sometimes you are well aware of silly things you have done and would like PMake to stop bothering you. This flag tells it to shut up about anything non-fatal. .IP \fB\-X\fP .Ix 0 def flags -X This flag causes PMake to not attempt to export any jobs to another machine. .LP Several flags may follow a single `\-'. Those flags that require arguments take them from successive parameters. E.g. .DS pmake -fDnI server.mk DEBUG /chip2/X/server/include .DE will cause PMake to read .CW server.mk as the input makefile, define the variable .CW DEBUG as a global variable and look for included makefiles in the directory .CW /chip2/X/server/include . .xH 2 Summary .LP A makefile is made of four types of lines: .RS .IP \(bu 2 Dependency lines .IP \(bu 2 Creation commands .IP \(bu 2 Variable assignments .IP \(bu 2 Comments, include statements and conditional directives .RE .LP A dependency line is a list of one or more targets, an operator .CW : ', (` .CW :: ', ` or .CW ! '), ` and a list of zero or more sources. Sources may contain wildcards and certain local variables. .LP A creation command is a regular shell command preceded by a tab. In addition, if the first two characters after the tab (and other whitespace) are a combination of .CW @ ' ` or .CW - ', ` PMake will cause the command to not be printed (if the character is .CW @ ') ` or errors from it to be ignored (if .CW - '). ` A blank line, dependency line or variable assignment terminates a creation script. There may be only one creation script for each target with a .CW : ' ` or .CW ! ' ` operator. .LP Variables are places to store text. They may be unconditionally assigned-to using the .CW = ' ` .Ix 0 ref = .Ix 0 ref variable assignment operator, appended-to using the .CW += ' ` .Ix 0 ref += .Ix 0 ref variable assignment appended operator, conditionally (if the variable is undefined) assigned-to with the .CW ?= ' ` .Ix 0 ref ?= .Ix 0 ref variable assignment conditional operator, and assigned-to with variable expansion with the .CW := ' ` .Ix 0 ref := .Ix 0 ref variable assignment expanded operator. The output of a shell command may be assigned to a variable using the .CW != ' ` .Ix 0 ref != .Ix 0 ref variable assignment shell-output operator. Variables may be expanded (their value inserted) by enclosing their name in parentheses or curly braces, preceded by a dollar sign. A dollar sign may be escaped with another dollar sign. Variables are not expanded if PMake doesn't know about them. There are seven local variables: .CW .TARGET , .CW .ALLSRC , .CW .OODATE , .CW .PREFIX , .CW .IMPSRC , .CW .ARCHIVE , and .CW .MEMBER . Four of them .CW .TARGET , ( .CW .PREFIX , .CW .ARCHIVE , and .CW .MEMBER ) may be used to specify ``dynamic sources.'' .Ix 0 ref "dynamic source" .Ix 0 ref source dynamic Variables are good. Know them. Love them. Live them. .LP Debugging of makefiles is best accomplished using the .B \-n , .B "\-d m" , and .B "\-p 2" flags. .xH 2 Exercises .ce \s+4\fBTBA\fP\s0 .xH 1 Short-cuts and Other Nice Things .LP Based on what I've told you so far, you may have gotten the impression that PMake is just a way of storing away commands and making sure you don't forget to compile something. Good. That's just what it is. However, the ways I've described have been inelegant, at best, and painful, at worst. This chapter contains things that make the writing of makefiles easier and the makefiles themselves shorter and easier to modify (and, occasionally, simpler). In this chapter, I assume you are somewhat more familiar with Sprite (or UNIX, if that's what you're using) than I did in chapter 2, just so you're on your toes. So without further ado... .xH 2 Transformation Rules .LP As you know, a file's name consists of two parts: a base name, which gives some hint as to the contents of the file, and a suffix, which usually indicates the format of the file. Over the years, as .UX has developed, naming conventions, with regard to suffixes, have also developed that have become almost as incontrovertible as Law. E.g. a file ending in .CW .c is assumed to contain C source code; one with a .CW .o suffix is assumed to be a compiled, relocatable object file that may be linked into any program; a file with a .CW .ms suffix is usually a text file to be processed by Troff with the \-ms macro package, and so on. One of the best aspects of both Make and PMake comes from their understanding of how the suffix of a file pertains to its contents and their ability to do things with a file based solely on its suffix. This ability comes from something known as a transformation rule. A transformation rule specifies how to change a file with one suffix into a file with another suffix. .LP A transformation rule looks much like a dependency line, except the target is made of two known suffixes stuck together. Suffixes are made known to PMake by placing them as sources on a dependency line whose target is the special target .CW .SUFFIXES . E.g. .DS \&.SUFFIXES : .o .c \&.c.o : $(CC) $(CFLAGS) -c $(.IMPSRC) .DE The creation script attached to the target is used to transform a file with the first suffix (in this case, .CW .c ) into a file with the second suffix (here, .CW .o ). In addition, the target inherits whatever attributes have been applied to the transformation rule. The simple rule given above says that to transform a C source file into an object file, you compile it using .CW cc with the .CW \-c flag. This rule is taken straight from the system makefile. Many transformation rules (and suffixes) are defined there, and I refer you to it for more examples (type .CW "pmake -h" '' `` to find out where it is). .LP There are several things to note about the transformation rule given above: .RS .IP 1) The .CW .IMPSRC variable. .Ix 0 def variable local .IMPSRC .Ix 0 def .IMPSRC This variable is set to the ``implied source'' (the file from which the target is being created; the one with the first suffix), which, in this case, is the .c file. .IP 2) The .CW CFLAGS variable. Almost all of the transformation rules in the system makefile are set up using variables that you can alter in your makefile to tailor the rule to your needs. In this case, if you want all your C files to be compiled with the .B \-g flag, to provide information for .CW dbx , you would set the .CW CFLAGS variable to contain .CW -g .CW "CFLAGS = -g" '') (`` and PMake would take care of the rest. .RE .LP To give you a quick example, the makefile in 2.3.4 .Rm 3 2.3.4 could be changed to this: .DS OBJS = a.o b.o c.o program : $(OBJS) $(CC) -o $(.TARGET) $(.ALLSRC) $(OBJS) : defs.h .DE The transformation rule I gave above takes the place of the 6 lines\** .FS This is also somewhat cleaner, I think, than the dynamic source solution presented in 2.6 .FE .Rm 4 2.6 .DS a.o : a.c cc -c a.c b.o : b.c cc -c b.c c.o : c.c cc -c c.c .DE .LP Now you may be wondering about the dependency between the .CW .o and .CW .c files \*- it's not mentioned anywhere in the new makefile. This is because it isn't needed: one of the effects of applying a transformation rule is the target comes to depend on the implied source. That's why it's called the implied .I source . .LP For a more detailed example. Say you have a makefile like this: .DS a.out : a.o b.o $(CC) $(.ALLSRC) .DE and a directory set up like this: .DS total 4 -rw-rw-r-- 1 deboor 34 Sep 7 00:43 Makefile -rw-rw-r-- 1 deboor 119 Oct 3 19:39 a.c -rw-rw-r-- 1 deboor 201 Sep 7 00:43 a.o -rw-rw-r-- 1 deboor 69 Sep 7 00:43 b.c .DE While just typing .CW pmake '' `` will do the right thing, it's much more informative to type .CW "pmake -d s" ''. `` This will show you what PMake is up to as it processes the files. In this case, PMake prints the following: .DS Suff_FindDeps (a.out) using existing source a.o applying .o -> .out to "a.o" Suff_FindDeps (a.o) trying a.c...got it applying .c -> .o to "a.c" Suff_FindDeps (b.o) trying b.c...got it applying .c -> .o to "b.c" Suff_FindDeps (a.c) trying a.y...not there trying a.l...not there trying a.c,v...not there trying a.y,v...not there trying a.l,v...not there Suff_FindDeps (b.c) trying b.y...not there trying b.l...not there trying b.c,v...not there trying b.y,v...not there trying b.l,v...not there --- a.o --- cc -c a.c --- b.o --- cc -c b.c --- a.out --- cc a.o b.o .DE .LP .CW Suff_FindDeps is the name of a function in PMake that is called to check for implied sources for a target using transformation rules. The transformations it tries are, naturally enough, limited to the ones that have been defined (a transformation may be defined multiple times, by the way, but only the most recent one will be used). You will notice, however, that there is a definite order to the suffixes that are tried. This order is set by the relative positions of the suffixes on the .CW .SUFFIXES line \*- the earlier a suffix appears, the earlier it is checked as the source of a transformation. Once a suffix has been defined, the only way to change its position in the pecking order is to remove all the suffixes (by having a .CW .SUFFIXES dependency line with no sources) and redefine them in the order you want. (Previously-defined transformation rules will be automatically redefined as the suffixes they involve are re-entered.) .LP Another way to affect the search order is to make the dependency explicit. In the above example, .CW a.out depends on .CW a.o and .CW b.o . Since a transformation exists from .CW .o to .CW .out , PMake uses that, as indicated by the .CW "using existing source a.o" '' `` message. .LP The search for a transformation starts from the suffix of the target and continues through all the defined transformations, in the order dictated by the suffix ranking, until an existing file with the same base (the target name minus the suffix and any leading directories) is found. At that point, one or more transformation rules will have been found to change the one existing file into the target. .LP For example, ignoring what's in the system makefile for now, say you have a makefile like this: .DS \&.SUFFIXES : .out .o .c .y .l \&.l.c : lex $(.IMPSRC) mv lex.yy.c $(.TARGET) \&.y.c : yacc $(.IMPSRC) mv y.tab.c $(.TARGET) \&.c.o : cc -c $(.IMPSRC) \&.o.out : cc -o $(.TARGET) $(.IMPSRC) .DE and the single file .CW jive.l . If you were to type .CW "pmake -rd ms jive.out" ,'' `` you would get the following output for .CW jive.out : .DS Suff_FindDeps (jive.out) trying jive.o...not there trying jive.c...not there trying jive.y...not there trying jive.l...got it applying .l -> .c to "jive.l" applying .c -> .o to "jive.c" applying .o -> .out to "jive.o" .DE and this is why: PMake starts with the target .CW jive.out , figures out its suffix .CW .out ) ( and looks for things it can transform to a .CW .out file. In this case, it only finds .CW .o , so it looks for the file .CW jive.o . It fails to find it, so it looks for transformations into a .CW .o file. Again it has only one choice: .CW .c . So it looks for .CW jive.c and, as you know, fails to find it. At this point it has two choices: it can create the .CW .c file from either a .CW .y file or a .CW .l file. Since .CW .y came first on the .CW .SUFFIXES line, it checks for .CW jive.y first, but can't find it, so it looks for .CW jive.l and, lo and behold, there it is. At this point, it has defined a transformation path as follows: .CW .l \(-> .CW .c \(-> .CW .o \(-> .CW .out and applies the transformation rules accordingly. For completeness, and to give you a better idea of what PMake actually did with this three-step transformation, this is what PMake printed for the rest of the process: .DS Suff_FindDeps (jive.o) using existing source jive.c applying .c -> .o to "jive.c" Suff_FindDeps (jive.c) using existing source jive.l applying .l -> .c to "jive.l" Suff_FindDeps (jive.l) Examining jive.l...modified 17:16:01 Oct 4, 1987...up-to-date -Examining jive.c...non-existent...out-of-date +Examining jive.c...nonexistent...out-of-date --- jive.c --- lex jive.l \&.\|.\|. meaningless lex output deleted .\|.\|. mv lex.yy.c jive.c -Examining jive.o...non-existent...out-of-date +Examining jive.o...nonexistent...out-of-date --- jive.o --- cc -c jive.c -Examining jive.out...non-existent...out-of-date +Examining jive.out...nonexistent...out-of-date --- jive.out --- cc -o jive.out jive.o .DE .LP One final question remains: what does PMake do with targets that have no known suffix? PMake simply pretends it actually has a known suffix and searches for transformations accordingly. The suffix it chooses is the source for the .CW .NULL .Ix 0 ref .NULL target mentioned later. In the system makefile, .CW .out is chosen as the ``null suffix'' .Ix 0 def suffix null .Ix 0 def "null suffix" because most people use PMake to create programs. You are, however, free and welcome to change it to a suffix of your own choosing. The null suffix is ignored, however, when PMake is in compatibility mode (see chapter 4). .xH 2 Including Other Makefiles .Ix 0 def makefile inclusion .Rd 2 .LP Just as for programs, it is often useful to extract certain parts of a makefile into another file and just include it in other makefiles somehow. Many compilers allow you say something like .DS #include "defs.h" .DE to include the contents of .CW defs.h in the source file. PMake allows you to do the same thing for makefiles, with the added ability to use variables in the filenames. An include directive in a makefile looks either like this: .DS #include .DE or this .DS #include "file" .DE The difference between the two is where PMake searches for the file: the first way, PMake will look for the file only in the system makefile directory (or directories) (to find out what that directory is, give PMake the .B \-h flag). .Ix 0 ref flags -h The system makefile directory search path can be overridden via the .B \-m option. .Ix 0 ref flags -m For files in double-quotes, the search is more complex: .RS .IP 1) The directory of the makefile that's including the file. .IP 2) The current directory (the one in which you invoked PMake). .IP 3) The directories given by you using .B \-I flags, in the order in which you gave them. .IP 4) Directories given by .CW .PATH dependency lines (see chapter 4). .IP 5) The system makefile directory. .RE .LP in that order. .LP You are free to use PMake variables in the filename\*-PMake will expand them before searching for the file. You must specify the searching method with either angle brackets or double-quotes .I outside of a variable expansion. I.e. the following .DS SYSTEM = #include $(SYSTEM) .DE won't work. .xH 2 Saving Commands .LP .Ix 0 def ... There may come a time when you will want to save certain commands to be executed when everything else is done. For instance: you're making several different libraries at one time and you want to create the members in parallel. Problem is, .CW ranlib is another one of those programs that can't be run more than once in the same directory at the same time (each one creates a file called .CW __.SYMDEF into which it stuffs information for the linker to use. Two of them running at once will overwrite each other's file and the result will be garbage for both parties). You might want a way to save the ranlib commands til the end so they can be run one after the other, thus keeping them from trashing each other's file. PMake allows you to do this by inserting an ellipsis (``.\|.\|.'') as a command between commands to be run at once and those to be run later. .LP So for the .CW ranlib case above, you might do this: .Rd 5 .DS lib1.a : $(LIB1OBJS) rm -f $(.TARGET) ar cr $(.TARGET) $(.ALLSRC) ... ranlib $(.TARGET) lib2.a : $(LIB2OBJS) rm -f $(.TARGET) ar cr $(.TARGET) $(.ALLSRC) ... ranlib $(.TARGET) .DE .Ix 0 ref variable local .TARGET .Ix 0 ref variable local .ALLSRC This would save both .DS ranlib $(.TARGET) .DE commands until the end, when they would run one after the other (using the correct value for the .CW .TARGET variable, of course). .LP Commands saved in this manner are only executed if PMake manages to re-create everything without an error. .xH 2 Target Attributes .LP PMake allows you to give attributes to targets by means of special sources. Like everything else PMake uses, these sources begin with a period and are made up of all upper-case letters. There are various reasons for using them, and I will try to give examples for most of them. Others you'll have to find uses for yourself. Think of it as ``an exercise for the reader.'' By placing one (or more) of these as a source on a dependency line, you are ``marking the target(s) with that attribute.'' That's just the way I phrase it, so you know. .LP Any attributes given as sources for a transformation rule are applied to the target of the transformation rule when the rule is applied. .Ix 0 def attributes .Ix 0 ref source .Ix 0 ref target .nr pw 12 .IP .DONTCARE \n(pw .Ix 0 def attributes .DONTCARE .Ix 0 def .DONTCARE If a target is marked with this attribute and PMake can't figure out how to create it, it will ignore this fact and assume the file isn't really needed or actually exists and PMake just can't find it. This may prove wrong, but the error will be noted later on, not when PMake tries to create the target so marked. This attribute also prevents PMake from attempting to touch the target if it is given the .B \-t flag. .Ix 0 ref flags -t .IP .EXEC \n(pw .Ix 0 def attributes .EXEC .Ix 0 def .EXEC This attribute causes its shell script to be executed while having no effect on targets that depend on it. This makes the target into a sort of subroutine. An example. Say you have some LISP files that need to be compiled and loaded into a LISP process. To do this, you echo LISP commands into a file and execute a LISP with this file as its input when everything's done. Say also that you have to load other files from another system before you can compile your files and further, that you don't want to go through the loading and dumping unless one of .I your files has changed. Your makefile might look a little bit like this (remember, this is an educational example, and don't worry about the .CW COMPILE rule, all will soon become clear, grasshopper): .DS system : init a.fasl b.fasl c.fasl for i in $(.ALLSRC); do echo -n '(load "' >> input echo -n ${i} >> input echo '")' >> input done echo '(dump "$(.TARGET)")' >> input lisp < input a.fasl : a.l init COMPILE b.fasl : b.l init COMPILE c.fasl : c.l init COMPILE COMPILE : .USE echo '(compile "$(.ALLSRC)")' >> input init : .EXEC echo '(load-system)' > input .DE .Ix 0 ref .USE .Ix 0 ref attributes .USE .Ix 0 ref variable local .ALLSRC .IP "\&" .CW .EXEC sources, don't appear in the local variables of targets that depend on them (nor are they touched if PMake is given the .B \-t flag). .Ix 0 ref flags -t Note that all the rules, not just that for .CW system , include .CW init as a source. This is because none of the other targets can be made until .CW init has been made, thus they depend on it. .IP .EXPORT \n(pw .Ix 0 def attributes .EXPORT .Ix 0 def .EXPORT This is used to mark those targets whose creation should be sent to another machine if at all possible. This may be used by some exportation schemes if the exportation is expensive. You should ask your system administrator if it is necessary. .IP .EXPORTSAME \n(pw .Ix 0 def attributes .EXPORTSAME .Ix 0 def .EXPORTSAME Tells the export system that the job should be exported to a machine of the same architecture as the current one. Certain operations (e.g. running text through .CW nroff ) can be performed the same on any architecture (CPU and operating system type), while others (e.g. compiling a program with .CW cc ) must be performed on a machine with the same architecture. Not all export systems will support this attribute. .IP .IGNORE \n(pw .Ix 0 def attributes .IGNORE .Ix 0 def .IGNORE attribute Giving a target the .CW .IGNORE attribute causes PMake to ignore errors from any of the target's commands, as if they all had `\-' before them. .IP .INVISIBLE \n(pw .Ix 0 def attributes .INVISIBLE .Ix 0 def .INVISIBLE This allows you to specify one target as a source for another without the one affecting the other's local variables. Useful if, say, you have a makefile that creates two programs, one of which is used to create the other, so it must exist before the other is created. You could say .DS prog1 : $(PROG1OBJS) prog2 MAKEINSTALL prog2 : $(PROG2OBJS) .INVISIBLE MAKEINSTALL .DE where .CW MAKEINSTALL is some complex .USE rule (see below) that depends on the .Ix 0 ref .USE .CW .ALLSRC variable containing the right things. Without the .CW .INVISIBLE attribute for .CW prog2 , the .CW MAKEINSTALL rule couldn't be applied. This is not as useful as it should be, and the semantics may change (or the whole thing go away) in the not-too-distant future. .IP .JOIN \n(pw .Ix 0 def attributes .JOIN .Ix 0 def .JOIN This is another way to avoid performing some operations in parallel while permitting everything else to be done so. Specifically it forces the target's shell script to be executed only if one or more of the sources was out-of-date. In addition, the target's name, in both its .CW .TARGET variable and all the local variables of any target that depends on it, is replaced by the value of its .CW .ALLSRC variable. As an example, suppose you have a program that has four libraries that compile in the same directory along with, and at the same time as, the program. You again have the problem with .CW ranlib that I mentioned earlier, only this time it's more severe: you can't just put the ranlib off to the end since the program will need those libraries before it can be re-created. You can do something like this: .DS program : $(OBJS) libraries cc -o $(.TARGET) $(.ALLSRC) libraries : lib1.a lib2.a lib3.a lib4.a .JOIN ranlib $(.OODATE) .DE .Ix 0 ref variable local .TARGET .Ix 0 ref variable local .ALLSRC .Ix 0 ref variable local .OODATE .Ix 0 ref .TARGET .Ix 0 ref .ALLSRC .Ix 0 ref .OODATE In this case, PMake will re-create the .CW $(OBJS) as necessary, along with .CW lib1.a , .CW lib2.a , .CW lib3.a and .CW lib4.a . It will then execute .CW ranlib on any library that was changed and set .CW program 's .CW .ALLSRC variable to contain what's in .CW $(OBJS) followed by .CW "lib1.a lib2.a lib3.a lib4.a" .'' `` In case you're wondering, it's called .CW .JOIN because it joins together different threads of the ``input graph'' at the target marked with the attribute. Another aspect of the .JOIN attribute is it keeps the target from being created if the .B \-t flag was given. .Ix 0 ref flags -t .IP .MAKE \n(pw .Ix 0 def attributes .MAKE .Ix 0 def .MAKE The .CW .MAKE attribute marks its target as being a recursive invocation of PMake. This forces PMake to execute the script associated with the target (if it's out-of-date) even if you gave the .B \-n or .B \-t flag. By doing this, you can start at the top of a system and type .DS pmake -n .DE and have it descend the directory tree (if your makefiles are set up correctly), printing what it would have executed if you hadn't included the .B \-n flag. .IP .NOEXPORT \n(pw .Ix 0 def attributes .NOEXPORT .Ix 0 def .NOEXPORT attribute If possible, PMake will attempt to export the creation of all targets to another machine (this depends on how PMake was configured). Sometimes, the creation is so simple, it is pointless to send it to another machine. If you give the target the .CW .NOEXPORT attribute, it will be run locally, even if you've given PMake the .B "\-L 0" flag. .IP .NOTMAIN \n(pw .Ix 0 def attributes .NOTMAIN .Ix 0 def .NOTMAIN Normally, if you do not specify a target to make in any other way, PMake will take the first target on the first dependency line of a makefile as the target to create. That target is known as the ``Main Target'' and is labeled as such if you print the dependencies out using the .B \-p flag. .Ix 0 ref flags -p Giving a target this attribute tells PMake that the target is definitely .I not the Main Target. This allows you to place targets in an included makefile and have PMake create something else by default. .IP .PRECIOUS \n(pw .Ix 0 def attributes .PRECIOUS .Ix 0 def .PRECIOUS attribute When PMake is interrupted (you type control-C at the keyboard), it will attempt to clean up after itself by removing any half-made targets. If a target has the .CW .PRECIOUS attribute, however, PMake will leave it alone. An additional side effect of the `::' operator is to mark the targets as .CW .PRECIOUS . .Ix 0 ref operator double-colon .Ix 0 ref :: .IP .SILENT \n(pw .Ix 0 def attributes .SILENT .Ix 0 def .SILENT attribute Marking a target with this attribute keeps its commands from being printed when they're executed, just as if they had an `@' in front of them. .IP .USE \n(pw .Ix 0 def attributes .USE .Ix 0 def .USE By giving a target this attribute, you turn it into PMake's equivalent of a macro. When the target is used as a source for another target, the other target acquires the commands, sources and attributes (except .CW .USE ) of the source. If the target already has commands, the .CW .USE target's commands are added to the end. If more than one .USE-marked source is given to a target, the rules are applied sequentially. .IP "\&" \n(pw The typical .USE rule (as I call them) will use the sources of the target to which it is applied (as stored in the .CW .ALLSRC variable for the target) as its ``arguments,'' if you will. For example, you probably noticed that the commands for creating .CW lib1.a and .CW lib2.a in the example in section 3.3 .Rm 5 3.3 were exactly the same. You can use the .CW .USE attribute to eliminate the repetition, like so: .DS lib1.a : $(LIB1OBJS) MAKELIB lib2.a : $(LIB2OBJS) MAKELIB MAKELIB : .USE rm -f $(.TARGET) ar cr $(.TARGET) $(.ALLSRC) ... ranlib $(.TARGET) .DE .Ix 0 ref variable local .TARGET .Ix 0 ref variable local .ALLSRC .IP "\&" \n(pw Several system makefiles (not to be confused with The System Makefile) make use of these .USE rules to make your life easier (they're in the default, system makefile directory...take a look). Note that the .USE rule source itself .CW MAKELIB ) ( does not appear in any of the targets's local variables. There is no limit to the number of times I could use the .CW MAKELIB rule. If there were more libraries, I could continue with .CW "lib3.a : $(LIB3OBJS) MAKELIB" '' `` and so on and so forth. .xH 2 Special Targets .LP As there were in Make, so there are certain targets that have special meaning to PMake. When you use one on a dependency line, it is the only target that may appear on the left-hand-side of the operator. .Ix 0 ref target .Ix 0 ref operator As for the attributes and variables, all the special targets begin with a period and consist of upper-case letters only. I won't describe them all in detail because some of them are rather complex and I'll describe them in more detail than you'll want in chapter 4. The targets are as follows: .nr pw 10 .IP .BEGIN \n(pw .Ix 0 def .BEGIN Any commands attached to this target are executed before anything else is done. You can use it for any initialization that needs doing. .IP .DEFAULT \n(pw .Ix 0 def .DEFAULT This is sort of a .USE rule for any target (that was used only as a source) that PMake can't figure out any other way to create. It's only ``sort of'' a .USE rule because only the shell script attached to the .CW .DEFAULT target is used. The .CW .IMPSRC variable of a target that inherits .CW .DEFAULT 's commands is set to the target's own name. .Ix 0 ref .IMPSRC .Ix 0 ref variable local .IMPSRC .IP .END \n(pw .Ix 0 def .END This serves a function similar to .CW .BEGIN , in that commands attached to it are executed once everything has been re-created (so long as no errors occurred). It also serves the extra function of being a place on which PMake can hang commands you put off to the end. Thus the script for this target will be executed before any of the commands you save with the ``.\|.\|.''. .Ix 0 ref ... .IP .EXPORT \n(pw The sources for this target are passed to the exportation system compiled into PMake. Some systems will use these sources to configure themselves. You should ask your system administrator about this. .IP .IGNORE \n(pw .Ix 0 def .IGNORE target .Ix 0 ref .IGNORE attribute .Ix 0 ref attributes .IGNORE This target marks each of its sources with the .CW .IGNORE attribute. If you don't give it any sources, then it is like giving the .B \-i flag when you invoke PMake \*- errors are ignored for all commands. .Ix 0 ref flags -i .IP .INCLUDES \n(pw .Ix 0 def .INCLUDES target .Ix 0 def variable global .INCLUDES .Ix 0 def .INCLUDES variable The sources for this target are taken to be suffixes that indicate a file that can be included in a program source file. The suffix must have already been declared with .CW .SUFFIXES (see below). Any suffix so marked will have the directories on its search path (see .CW .PATH , below) placed in the .CW .INCLUDES variable, each preceded by a .B \-I flag. This variable can then be used as an argument for the compiler in the normal fashion. The .CW .h suffix is already marked in this way in the system makefile. .Ix 0 ref makefile system E.g. if you have .DS \&.SUFFIXES : .bitmap \&.PATH.bitmap : /usr/local/X/lib/bitmaps \&.INCLUDES : .bitmap .DE PMake will place .CW "-I/usr/local/X/lib/bitmaps" '' `` in the .CW .INCLUDES variable and you can then say .DS cc $(.INCLUDES) -c xprogram.c .DE (Note: the .CW .INCLUDES variable is not actually filled in until the entire makefile has been read.) .IP .INTERRUPT \n(pw .Ix 0 def .INTERRUPT When PMake is interrupted, it will execute the commands in the script for this target, if it exists. .IP .LIBS \n(pw .Ix 0 def .LIBS target .Ix 0 def .LIBS variable .Ix 0 def variable global .LIBS This does for libraries what .CW .INCLUDES does for include files, except the flag used is .B \-L , as required by those linkers that allow you to tell them where to find libraries. The variable used is .CW .LIBS . Be forewarned that PMake may not have been compiled to do this if the linker on your system doesn't accept the .B \-L flag, though the .CW .LIBS variable will always be defined once the makefile has been read. .IP .MAIN \n(pw .Ix 0 def .MAIN If you didn't give a target (or targets) to create when you invoked PMake, it will take the sources of this target as the targets to create. .IP .MAKEFLAGS \n(pw .Ix 0 def .MAKEFLAGS target This target provides a way for you to always specify flags for PMake when the makefile is used. The flags are just as they would be typed to the shell (except you can't use shell variables unless they're in the environment), though the .B \-f and .B \-r flags have no effect. .IP .NULL \n(pw .Ix 0 def .NULL .Ix 0 ref suffix null .Ix 0 ref "null suffix" This allows you to specify what suffix PMake should pretend a file has if, in fact, it has no known suffix. Only one suffix may be so designated. The last source on the dependency line is the suffix that is used (you should, however, only give one suffix.\|.\|.). .IP .PATH \n(pw .Ix 0 def .PATH If you give sources for this target, PMake will take them as directories in which to search for files it cannot find in the current directory. If you give no sources, it will clear out any directories added to the search path before. Since the effects of this all get very complex, I'll leave it til chapter four to give you a complete explanation. .IP .PATH\fIsuffix\fP \n(pw .Ix 0 ref .PATH This does a similar thing to .CW .PATH , but it does it only for files with the given suffix. The suffix must have been defined already. Look at .B "Search Paths" (section 4.1) .Rm 6 4.1 for more information. .IP .PRECIOUS \n(pw .Ix 0 def .PRECIOUS target .Ix 0 ref .PRECIOUS attribute .Ix 0 ref attributes .PRECIOUS Similar to .CW .IGNORE , this gives the .CW .PRECIOUS attribute to each source on the dependency line, unless there are no sources, in which case the .CW .PRECIOUS attribute is given to every target in the file. .IP .RECURSIVE \n(pw .Ix 0 def .RECURSIVE .Ix 0 ref attributes .MAKE .Ix 0 ref .MAKE This target applies the .CW .MAKE attribute to all its sources. It does nothing if you don't give it any sources. .IP .SHELL \n(pw .Ix 0 def .SHELL PMake is not constrained to only using the Bourne shell to execute the commands you put in the makefile. You can tell it some other shell to use with this target. Check out .B "A Shell is a Shell is a Shell" (section 4.4) .Rm 7 4.4 for more information. .IP .SILENT \n(pw .Ix 0 def .SILENT target .Ix 0 ref .SILENT attribute .Ix 0 ref attributes .SILENT When you use .CW .SILENT as a target, it applies the .CW .SILENT attribute to each of its sources. If there are no sources on the dependency line, then it is as if you gave PMake the .B \-s flag and no commands will be echoed. .IP .SUFFIXES \n(pw .Ix 0 def .SUFFIXES This is used to give new file suffixes for PMake to handle. Each source is a suffix PMake should recognize. If you give a .CW .SUFFIXES dependency line with no sources, PMake will forget about all the suffixes it knew (this also nukes the null suffix). For those targets that need to have suffixes defined, this is how you do it. .LP In addition to these targets, a line of the form .DS \fIattribute\fP : \fIsources\fP .DE applies the .I attribute to all the targets listed as .I sources . .xH 2 Modifying Variable Expansion .LP .Ix 0 def variable expansion modified .Ix 0 ref variable expansion .Ix 0 def variable modifiers Variables need not always be expanded verbatim. PMake defines several modifiers that may be applied to a variable's value before it is expanded. You apply a modifier by placing it after the variable name with a colon between the two, like so: .DS ${\fIVARIABLE\fP:\fImodifier\fP} .DE Each modifier is a single character followed by something specific to the modifier itself. You may apply as many modifiers as you want \*- each one is applied to the result of the previous and is separated from the previous by another colon. .LP There are seven ways to modify a variable's expansion, most of which come from the C shell variable modification characters: .RS .IP "M\fIpattern\fP" .Ix 0 def :M .Ix 0 def modifier match This is used to select only those words (a word is a series of characters that are neither spaces nor tabs) that match the given .I pattern . The pattern is a wildcard pattern like that used by the shell, where .CW * means 0 or more characters of any sort; .CW ? is any single character; .CW [abcd] matches any single character that is either `a', `b', `c' or `d' (there may be any number of characters between the brackets); .CW [0-9] matches any single character that is between `0' and `9' (i.e. any digit. This form may be freely mixed with the other bracket form), and `\\' is used to escape any of the characters `*', `?', `[' or `:', leaving them as regular characters to match themselves in a word. For example, the system makefile .CW uses .CW "$(CFLAGS:M-[ID]*)" '' `` to extract all the .CW \-I and .CW \-D flags that would be passed to the C compiler. This allows it to properly locate include files and generate the correct dependencies. .IP "N\fIpattern\fP" .Ix 0 def :N .Ix 0 def modifier nomatch This is identical to .CW :M except it substitutes all words that don't match the given pattern. .IP "S/\fIsearch-string\fP/\fIreplacement-string\fP/[g]" .Ix 0 def :S .Ix 0 def modifier substitute Causes the first occurrence of .I search-string in the variable to be replaced by .I replacement-string , unless the .CW g flag is given at the end, in which case all occurrences of the string are replaced. The substitution is performed on each word in the variable in turn. If .I search-string begins with a .CW ^ , the string must match starting at the beginning of the word. If .I search-string ends with a .CW $ , the string must match to the end of the word (these two may be combined to force an exact match). If a backslash precedes these two characters, however, they lose their special meaning. Variable expansion also occurs in the normal fashion inside both the .I search-string and the .I replacement-string , .B except that a backslash is used to prevent the expansion of a .CW $ , not another dollar sign, as is usual. Note that .I search-string is just a string, not a pattern, so none of the usual regular-expression/wildcard characters have any special meaning save .CW ^ and .CW $ . In the replacement string, the .CW & character is replaced by the .I search-string unless it is preceded by a backslash. You are allowed to use any character except colon or exclamation point to separate the two strings. This so-called delimiter character may be placed in either string by preceding it with a backslash. .IP T .Ix 0 def :T .Ix 0 def modifier tail Replaces each word in the variable expansion by its last component (its ``tail''). For example, given .DS OBJS = ../lib/a.o b /usr/lib/libm.a TAILS = $(OBJS:T) .DE the variable .CW TAILS would expand to .CW "a.o b libm.a" .'' `` .IP H .Ix 0 def :H .Ix 0 def modifier head This is similar to .CW :T , except that every word is replaced by everything but the tail (the ``head''). Using the same definition of .CW OBJS , the string .CW "$(OBJS:H)" '' `` would expand to .CW "../lib /usr/lib" .'' `` Note that the final slash on the heads is removed and anything without a head is replaced by the empty string. .IP E .Ix 0 def :E .Ix 0 def modifier extension .Ix 0 def modifier suffix .Ix 0 ref suffix "variable modifier" .CW :E replaces each word by its suffix (``extension''). So .CW "$(OBJS:E)" '' `` would give you .CW ".o .a" .'' `` .IP R .Ix 0 def :R .Ix 0 def modifier root .Ix 0 def modifier base This replaces each word by everything but the suffix (the ``root'' of the word). .CW "$(OBJS:R)" '' `` expands to `` .CW "../lib/a b /usr/lib/libm" .'' .RE .LP In addition, the System V style of substitution is also supported. This looks like: .DS $(\fIVARIABLE\fP:\fIsearch-string\fP=\fIreplacement\fP) .DE It must be the last modifier in the chain. The search is anchored at the end of each word, so only suffixes or whole words may be replaced. .xH 2 More on Debugging .xH 2 More Exercises .IP (3.1) You've got a set programs, each of which is created from its own assembly-language source file (suffix .CW .asm ). Each program can be assembled into two versions, one with error-checking code assembled in and one without. You could assemble them into files with different suffixes .CW .eobj \& ( and .CW .obj , for instance), but your linker only understands files that end in .CW .obj . To top it all off, the final executables .I must have the suffix .CW .exe . How can you still use transformation rules to make your life easier (Hint: assume the error-checking versions have .CW ec tacked onto their prefix)? .IP (3.2) Assume, for a moment or two, you want to perform a sort of ``indirection'' by placing the name of a variable into another one, then you want to get the value of the first by expanding the second somehow. Unfortunately, PMake doesn't allow constructs like .DS I $($(FOO)) .DE What do you do? Hint: no further variable expansion is performed after modifiers are applied, thus if you cause a $ to occur in the expansion, that's what will be in the result. .xH 1 PMake for Gods .LP This chapter is devoted to those facilities in PMake that allow you to do a great deal in a makefile with very little work, as well as do some things you couldn't do in Make without a great deal of work (and perhaps the use of other programs). The problem with these features, is they must be handled with care, or you will end up with a mess. .LP Once more, I assume a greater familiarity with .UX or Sprite than I did in the previous two chapters. .xH 2 Search Paths .Rd 6 .LP PMake supports the dispersal of files into multiple directories by allowing you to specify places to look for sources with .CW .PATH targets in the makefile. The directories you give as sources for these targets make up a ``search path.'' Only those files used exclusively as sources are actually sought on a search path, the assumption being that anything listed as a target in the makefile can be created by the makefile and thus should be in the current directory. .LP There are two types of search paths in PMake: one is used for all types of files (including included makefiles) and is specified with a plain .CW .PATH target (e.g. .CW ".PATH : RCS" ''), `` while the other is specific to a certain type of file, as indicated by the file's suffix. A specific search path is indicated by immediately following the .CW .PATH with the suffix of the file. For instance .DS \&.PATH.h : /sprite/lib/include /sprite/att/lib/include .DE would tell PMake to look in the directories .CW /sprite/lib/include and .CW /sprite/att/lib/include for any files whose suffix is .CW .h . .LP The current directory is always consulted first to see if a file exists. Only if it cannot be found there are the directories in the specific search path, followed by those in the general search path, consulted. .LP A search path is also used when expanding wildcard characters. If the pattern has a recognizable suffix on it, the path for that suffix will be used for the expansion. Otherwise the default search path is employed. .LP When a file is found in some directory other than the current one, all local variables that would have contained the target's name .CW .ALLSRC , ( and .CW .IMPSRC ) will instead contain the path to the file, as found by PMake. Thus if you have a file .CW ../lib/mumble.c and a makefile .DS \&.PATH.c : ../lib mumble : mumble.c $(CC) -o $(.TARGET) $(.ALLSRC) .DE the command executed to create .CW mumble would be .CW "cc -o mumble ../lib/mumble.c" .'' `` (As an aside, the command in this case isn't strictly necessary, since it will be found using transformation rules if it isn't given. This is because .CW .out is the null suffix by default and a transformation exists from .CW .c to .CW .out . Just thought I'd throw that in.) .LP If a file exists in two directories on the same search path, the file in the first directory on the path will be the one PMake uses. So if you have a large system spread over many directories, it would behoove you to follow a naming convention that avoids such conflicts. .LP Something you should know about the way search paths are implemented is that each directory is read, and its contents cached, exactly once \&\*- when it is first encountered \*- so any changes to the directories while PMake is running will not be noted when searching for implicit sources, nor will they be found when PMake attempts to discover when the file was last modified, unless the file was created in the current directory. While people have suggested that PMake should read the directories each time, my experience suggests that the caching seldom causes problems. In addition, not caching the directories slows things down enormously because of PMake's attempts to apply transformation -rules through non-existent files \*- the number of extra file-system +rules through nonexistent files \*- the number of extra file-system searches is truly staggering, especially if many files without suffixes are used and the null suffix isn't changed from .CW .out . .xH 2 Archives and Libraries .LP .UX and Sprite allow you to merge files into an archive using the .CW ar command. Further, if the files are relocatable object files, you can run .CW ranlib on the archive and get yourself a library that you can link into any program you want. The main problem with archives is they double the space you need to store the archived files, since there's one copy in the archive and one copy out by itself. The problem with libraries is you usually think of them as .CW -lm rather than .CW /usr/lib/libm.a and the linker thinks they're out-of-date if you so much as look at them. .LP PMake solves the problem with archives by allowing you to tell it to examine the files in the archives (so you can remove the individual files without having to regenerate them later). To handle the problem with libraries, PMake adds an additional way of deciding if a library is out-of-date: .IP \(bu 2 If the table of contents is older than the library, or is missing, the library is out-of-date. .LP A library is any target that looks like .CW \-l name'' `` or that ends in a suffix that was marked as a library using the .CW .LIBS target. .CW .a is so marked in the system makefile. .LP Members of an archive are specified as ``\fIarchive\fP(\fImember\fP[ \fImember\fP...])''. Thus .CW libdix.a(window.o) '' ``' specifies the file .CW window.o in the archive .CW libdix.a . You may also use wildcards to specify the members of the archive. Just remember that most the wildcard characters will only find .I existing files. .LP A file that is a member of an archive is treated specially. If the file doesn't exist, but it is in the archive, the modification time recorded in the archive is used for the file when determining if the file is out-of-date. When figuring out how to make an archived member target (not the file itself, but the file in the archive \*- the \fIarchive\fP(\fImember\fP) target), special care is taken with the transformation rules, as follows: .IP \(bu 2 \&\fIarchive\fP(\fImember\fP) is made to depend on \fImember\fP. .IP \(bu 2 The transformation from the \fImember\fP's suffix to the \fIarchive\fP's suffix is applied to the \fIarchive\fP(\fImember\fP) target. .IP \(bu 2 The \fIarchive\fP(\fImember\fP)'s .CW .TARGET variable is set to the name of the \fImember\fP if \fImember\fP is actually a target, or the path to the member file if \fImember\fP is only a source. .IP \(bu 2 The .CW .ARCHIVE variable for the \fIarchive\fP(\fImember\fP) target is set to the name of the \fIarchive\fP. .Ix 0 def variable local .ARCHIVE .Ix 0 def .ARCHIVE .IP \(bu 2 The .CW .MEMBER variable is set to the actual string inside the parentheses. In most cases, this will be the same as the .CW .TARGET variable. .Ix 0 def variable local .MEMBER .Ix 0 def .MEMBER .IP \(bu 2 The \fIarchive\fP(\fImember\fP)'s place in the local variables of the targets that depend on it is taken by the value of its .CW .TARGET variable. .LP Thus, a program library could be created with the following makefile: .DS \&.o.a : ... rm -f $(.TARGET:T) OBJS = obj1.o obj2.o obj3.o libprog.a : libprog.a($(OBJS)) ar cru $(.TARGET) $(.OODATE) ranlib $(.TARGET) .DE This will cause the three object files to be compiled (if the corresponding source files were modified after the object file or, if that doesn't exist, the archived object file), the out-of-date ones archived in .CW libprog.a , a table of contents placed in the archive and the newly-archived object files to be removed. .LP All this is used in the .CW makelib.mk system makefile to create a single library with ease. This makefile looks like this: .DS .SM # # Rules for making libraries. The object files that make up the library # are removed once they are archived. # # To make several libraries in parallel, you should define the variable # "many_libraries". This will serialize the invocations of ranlib. # # To use, do something like this: # # OBJECTS = # # fish.a: fish.a($(OBJECTS)) MAKELIB # # #ifndef _MAKELIB_MK _MAKELIB_MK = #include \&.po.a .o.a : ... rm -f $(.MEMBER) ARFLAGS ?= crl # # Re-archive the out-of-date members and recreate the library's table of # contents using ranlib. If many_libraries is defined, put the ranlib # off til the end so many libraries can be made at once. # MAKELIB : .USE .PRECIOUS ar $(ARFLAGS) $(.TARGET) $(.OODATE) #ifndef no_ranlib # ifdef many_libraries ... # endif /* many_libraries */ ranlib $(.TARGET) #endif /* no_ranlib */ #endif /* _MAKELIB_MK */ .DE .xH 2 On the Condition... .Rd 1 .LP Like the C compiler before it, PMake allows you to configure the makefile, based on the current environment, using conditional statements. A conditional looks like this: .DS #if \fIboolean expression\fP \fIlines\fP #elif \fIanother boolean expression\fP \fImore lines\fP #else \fIstill more lines\fP #endif .DE They may be nested to a maximum depth of 30 and may occur anywhere (except in a comment, of course). The .CW # '' `` must the very first character on the line. .LP Each .I "boolean expression" is made up of terms that look like function calls, the standard C boolean operators .CW && , .CW || , and .CW ! , and the standard relational operators .CW == , .CW != , .CW > , .CW >= , .CW < , and .CW <= , with .CW == and .CW != being overloaded to allow string comparisons as well. .CW && represents logical AND; .CW || is logical OR and .CW ! is logical NOT. The arithmetic and string operators take precedence over all three of these operators, while NOT takes precedence over AND, which takes precedence over OR. This precedence may be overridden with parentheses, and an expression may be parenthesized to your heart's content. Each term looks like a call on one of four functions: .nr pw 9 .Ix 0 def make .Ix 0 def conditional make .Ix 0 def if make .IP make \n(pw The syntax is .CW make( \fItarget\fP\c .CW ) where .I target is a target in the makefile. This is true if the given target was specified on the command line, or as the source for a .CW .MAIN target (note that the sources for .CW .MAIN are only used if no targets were given on the command line). .IP defined \n(pw .Ix 0 def defined .Ix 0 def conditional defined .Ix 0 def if defined The syntax is .CW defined( \fIvariable\fP\c .CW ) and is true if .I variable is defined. Certain variables are defined in the system makefile that identify the system on which PMake is being run. .IP exists \n(pw .Ix 0 def exists .Ix 0 def conditional exists .Ix 0 def if exists The syntax is .CW exists( \fIfile\fP\c .CW ) and is true if the file can be found on the global search path (i.e. that defined by .CW .PATH targets, not by .CW .PATH \fIsuffix\fP targets). .IP empty \n(pw .Ix 0 def empty .Ix 0 def conditional empty .Ix 0 def if empty This syntax is much like the others, except the string inside the parentheses is of the same form as you would put between parentheses when expanding a variable, complete with modifiers and everything. The function returns true if the resulting string is empty (NOTE: an undefined variable in this context will cause at the very least a warning message about a malformed conditional, and at the worst will cause the process to stop once it has read the makefile. If you want to check for a variable being defined or empty, use the expression .CW !defined( \fIvar\fP\c `` .CW ") || empty(" \fIvar\fP\c .CW ) '' as the definition of .CW || will prevent the .CW empty() from being evaluated and causing an error, if the variable is undefined). This can be used to see if a variable contains a given word, for example: .DS #if !empty(\fIvar\fP:M\fIword\fP) .DE .LP The arithmetic and string operators may only be used to test the value of a variable. The lefthand side must contain the variable expansion, while the righthand side contains either a string, enclosed in double-quotes, or a number. The standard C numeric conventions (except for specifying an octal number) apply to both sides. E.g. .DS #if $(OS) == 4.3 #if $(MACHINE) == "sun3" #if $(LOAD_ADDR) < 0xc000 .DE are all valid conditionals. In addition, the numeric value of a variable can be tested as a boolean as follows: .DS #if $(LOAD) .DE would see if .CW LOAD contains a non-zero value and .DS #if !$(LOAD) .DE would test if .CW LOAD contains a zero value. .LP In addition to the bare .CW #if ,'' `` there are other forms that apply one of the first two functions to each term. They are as follows: .DS ifdef \fRdefined\fP ifndef \fR!defined\fP ifmake \fRmake\fP ifnmake \fR!make\fP .DE There are also the ``else if'' forms: .CW elif , .CW elifdef , .CW elifndef , .CW elifmake , and .CW elifnmake . .LP For instance, if you wish to create two versions of a program, one of which is optimized (the production version) and the other of which is for debugging (has symbols for dbx), you have two choices: you can create two makefiles, one of which uses the .CW \-g flag for the compilation, while the other uses the .CW \-O flag, or you can use another target (call it .CW debug ) to create the debug version. The construct below will take care of this for you. I have also made it so defining the variable .CW DEBUG (say with .CW "pmake -D DEBUG" ) will also cause the debug version to be made. .DS #if defined(DEBUG) || make(debug) CFLAGS += -g #else CFLAGS += -O #endif .DE There are, of course, problems with this approach. The most glaring annoyance is that if you want to go from making a debug version to making a production version, you have to remove all the object files, or you will get some optimized and some debug versions in the same program. Another annoyance is you have to be careful not to make two targets that ``conflict'' because of some conditionals in the makefile. For instance .DS #if make(print) FORMATTER = ditroff -Plaser_printer #endif #if make(draft) FORMATTER = nroff -Pdot_matrix_printer #endif .DE would wreak havoc if you tried .CW "pmake draft print" '' `` since you would use the same formatter for each target. As I said, this all gets somewhat complicated. .xH 2 A Shell is a Shell is a Shell .Rd 7 .LP In normal operation, the Bourne Shell (better known as .CW sh '') `` is used to execute the commands to re-create targets. PMake also allows you to specify a different shell for it to use when executing these commands. There are several things PMake must know about the shell you wish to use. These things are specified as the sources for the .CW .SHELL .Ix 0 ref .SHELL .Ix 0 ref target .SHELL target by keyword, as follows: .IP "\fBpath=\fP\fIpath\fP" PMake needs to know where the shell actually resides, so it can execute it. If you specify this and nothing else, PMake will use the last component of the path and look in its table of the shells it knows and use the specification it finds, if any. Use this if you just want to use a different version of the Bourne or C Shell (yes, PMake knows how to use the C Shell too). .IP "\fBname=\fP\fIname\fP" This is the name by which the shell is to be known. It is a single word and, if no other keywords are specified (other than .B path ), it is the name by which PMake attempts to find a specification for it (as mentioned above). You can use this if you would just rather use the C Shell than the Bourne Shell .CW ".SHELL: name=csh" '' (`` will do it). .IP "\fBquiet=\fP\fIecho-off command\fP" As mentioned before, PMake actually controls whether commands are printed by introducing commands into the shell's input stream. This keyword, and the next two, control what those commands are. The .B quiet keyword is the command used to turn echoing off. Once it is turned off, echoing is expected to remain off until the echo-on command is given. .IP "\fBecho=\fP\fIecho-on command\fP" The command PMake should give to turn echoing back on again. .IP "\fBfilter=\fP\fIprinted echo-off command\fP" Many shells will echo the echo-off command when it is given. This keyword tells PMake in what format the shell actually prints the echo-off command. Wherever PMake sees this string in the shell's output, it will delete it and any following whitespace, up to and including the next newline. See the example at the end of this section for more details. .IP "\fBechoFlag=\fP\fIflag to turn echoing on\fP" Unless a target has been marked .CW .SILENT , PMake wants to start the shell running with echoing on. To do this, it passes this flag to the shell as one of its arguments. If either this or the next flag begins with a `\-', the flags will be passed to the shell as separate arguments. Otherwise, the two will be concatenated (if they are used at the same time, of course). .IP "\fBerrFlag=\fP\fIflag to turn error checking on\fP" Likewise, unless a target is marked .CW .IGNORE , PMake wishes error-checking to be on from the very start. To this end, it will pass this flag to the shell as an argument. The same rules for an initial `\-' apply as for the .B echoFlag . .IP "\fBcheck=\fP\fIcommand to turn error checking on\fP" Just as for echo-control, error-control is achieved by inserting commands into the shell's input stream. This is the command to make the shell check for errors. It also serves another purpose if the shell doesn't have error-control as commands, but I'll get into that in a minute. Again, once error checking has been turned on, it is expected to remain on until it is turned off again. .IP "\fBignore=\fP\fIcommand to turn error checking off\fP" This is the command PMake uses to turn error checking off. It has another use if the shell doesn't do error-control, but I'll tell you about that.\|.\|.\|now. .IP "\fBhasErrCtl=\fP\fIyes or no\fP" This takes a value that is either .B yes or .B no . Now you might think that the existence of the .B check and .B ignore keywords would be enough to tell PMake if the shell can do error-control, but you'd be wrong. If .B hasErrCtl is .B yes , PMake uses the check and ignore commands in a straight-forward manner. If this is .B no , however, their use is rather different. In this case, the check command is used as a template, in which the string .B %s is replaced by the command that's about to be executed, to produce a command for the shell that will echo the command to be executed. The ignore command is also used as a template, again with .B %s replaced by the command to be executed, to produce a command that will execute the command to be executed and ignore any error it returns. When these strings are used as templates, you must provide newline(s) .CW \en '') (`` in the appropriate place(s). .LP The strings that follow these keywords may be enclosed in single or double quotes (the quotes will be stripped off) and may contain the usual C backslash-characters (\en is newline, \er is return, \eb is backspace, \e' escapes a single-quote inside single-quotes, \e" escapes a double-quote inside double-quotes). Now for an example. .LP This is actually the contents of the .CW system makefile, and causes PMake to use the Bourne Shell in such a way that each command is printed as it is executed. That is, if more than one command is given on a line, each will be printed separately. Similarly, each time the body of a loop is executed, the commands within that loop will be printed, etc. The specification runs like this: .DS # # This is a shell specification to have the Bourne shell echo # the commands just before executing them, rather than when it reads # them. Useful if you want to see how variables are being expanded, etc. # \&.SHELL : path=/bin/sh \e quiet="set -" \e echo="set -x" \e filter="+ set - " \e echoFlag=x \e errFlag=e \e hasErrCtl=yes \e check="set -e" \e ignore="set +e" .DE .LP It tells PMake the following: .Bp The shell is located in the file .CW /bin/sh . It need not tell PMake that the name of the shell is .CW sh as PMake can figure that out for itself (it's the last component of the path). .Bp The command to stop echoing is .CW "set -" . .Bp The command to start echoing is .CW "set -x" . .Bp When the echo off command is executed, the shell will print .CW "+ set - " (The `+' comes from using the .CW \-x flag (rather than the .CW \-v flag PMake usually uses)). PMake will remove all occurrences of this string from the output, so you don't notice extra commands you didn't put there. .Bp The flag the Bourne Shell will take to start echoing in this way is the .CW \-x flag. The Bourne Shell will only take its flag arguments concatenated as its first argument, so neither this nor the .B errFlag specification begins with a \-. .Bp The flag to use to turn error-checking on from the start is .CW \-e . .Bp The shell can turn error-checking on and off, and the commands to do so are .CW "set +e" and .CW "set -e" , respectively. .LP I should note that this specification is for Bourne Shells that are not part of Berkeley .UX , as shells from Berkeley don't do error control. You can get a similar effect, however, by changing the last three lines to be: .DS hasErrCtl=no \e check="echo \e"+ %s\e"\en" \e ignore="sh -c '%s || exit 0\en" .DE .LP This will cause PMake to execute the two commands .DS echo "+ \fIcmd\fP" sh -c '\fIcmd\fP || true' .DE for each command for which errors are to be ignored. (In case you are wondering, the thing for .CW ignore tells the shell to execute another shell without error checking on and always exit 0, since the .B || causes the .CW "exit 0" to be executed only if the first command exited non-zero, and if the first command exited zero, the shell will also exit zero, since that's the last command it executed). .xH 2 Compatibility .Ix 0 ref compatibility .LP There are three (well, 3 \(12) levels of backwards-compatibility built into PMake. Most makefiles will need none at all. Some may need a little bit of work to operate correctly when run in parallel. Each level encompasses the previous levels (e.g. .B \-B (one shell per command) implies .B \-V ) The three levels are described in the following three sections. .xH 3 DEFCON 3 \*- Variable Expansion .Ix 0 ref compatibility .LP As noted before, PMake will not expand a variable unless it knows of a value for it. This can cause problems for makefiles that expect to leave variables undefined except in special circumstances (e.g. if more flags need to be passed to the C compiler or the output from a text processor should be sent to a different printer). If the variables are enclosed in curly braces .CW ${PRINTER} ''), (`` the shell will let them pass. If they are enclosed in parentheses, however, the shell will declare a syntax error and the make will come to a grinding halt. .LP You have two choices: change the makefile to define the variables (their values can be overridden on the command line, since that's where they would have been set if you used Make, anyway) or always give the .B \-V flag (this can be done with the .CW .MAKEFLAGS target, if you want). .xH 3 DEFCON 2 \*- The Number of the Beast .Ix 0 ref compatibility .LP Then there are the makefiles that expect certain commands, such as changing to a different directory, to not affect other commands in a target's creation script. You can solve this is either by going back to executing one shell per command (which is what the .B \-B flag forces PMake to do), which slows the process down a good bit and requires you to use semicolons and escaped newlines for shell constructs, or by changing the makefile to execute the offending command(s) in a subshell (by placing the line inside parentheses), like so: .DS install :: .MAKE (cd src; $(.PMAKE) install) (cd lib; $(.PMAKE) install) (cd man; $(.PMAKE) install) .DE .Ix 0 ref operator double-colon .Ix 0 ref variable global .PMAKE .Ix 0 ref .PMAKE .Ix 0 ref .MAKE .Ix 0 ref attribute .MAKE This will always execute the three makes (even if the .B \-n flag was given) because of the combination of the ``::'' operator and the .CW .MAKE attribute. Each command will change to the proper directory to perform the install, leaving the main shell in the directory in which it started. .xH 3 "DEFCON 1 \*- Imitation is the Not the Highest Form of Flattery" .Ix 0 ref compatibility .LP The final category of makefile is the one where every command requires input, the dependencies are incompletely specified, or you simply cannot create more than one target at a time, as mentioned earlier. In addition, you may not have the time or desire to upgrade the makefile to run smoothly with PMake. If you are the conservative sort, this is the compatibility mode for you. It is entered either by giving PMake the .B \-M flag (for Make), or by executing PMake as .CW make .'' `` In either case, PMake performs things exactly like Make (while still supporting most of the nice new features PMake provides). This includes: .IP \(bu 2 No parallel execution. .IP \(bu 2 Targets are made in the exact order specified by the makefile. The sources for each target are made in strict left-to-right order, etc. .IP \(bu 2 A single Bourne shell is used to execute each command, thus the shell's .CW $$ variable is useless, changing directories doesn't work across command lines, etc. .IP \(bu 2 If no special characters exist in a command line, PMake will break the command into words itself and execute the command directly, without executing a shell first. The characters that cause PMake to execute a shell are: .CW # , .CW = , .CW | , .CW ^ , .CW ( , .CW ) , .CW { , .CW } , .CW ; , .CW & , .CW < , .CW > , .CW * , .CW ? , .CW [ , .CW ] , .CW : , .CW $ , .CW ` , and .CW \e . You should notice that these are all the characters that are given special meaning by the shell (except .CW ' and .CW " , which PMake deals with all by its lonesome). .IP \(bu 2 The use of the null suffix is turned off. .Ix 0 ref "null suffix" .Ix 0 ref suffix null .xH 2 The Way Things Work .LP When PMake reads the makefile, it parses sources and targets into nodes in a graph. The graph is directed only in the sense that PMake knows which way is up. Each node contains not only links to all its parents and children (the nodes that depend on it and those on which it depends, respectively), but also a count of the number of its children that have already been processed. .LP The most important thing to know about how PMake uses this graph is that the traversal is breadth-first and occurs in two passes. .LP After PMake has parsed the makefile, it begins with the nodes the user has told it to make (either on the command line, or via a .CW .MAIN target, or by the target being the first in the file not labeled with the .CW .NOTMAIN attribute) placed in a queue. It continues to take the node off the front of the queue, mark it as something that needs to be made, pass the node to .CW Suff_FindDeps (mentioned earlier) to find any implicit sources for the node, and place all the node's children that have yet to be marked at the end of the queue. If any of the children is a .CW .USE rule, its attributes are applied to the parent, then its commands are appended to the parent's list of commands and its children are linked to its parent. The parent's unmade children counter is then decremented (since the .CW .USE node has been processed). You will note that this allows a .CW .USE node to have children that are .CW .USE nodes and the rules will be applied in sequence. If the node has no children, it is placed at the end of another queue to be examined in the second pass. This process continues until the first queue is empty. .LP At this point, all the leaves of the graph are in the examination queue. PMake removes the node at the head of the queue and sees if it is out-of-date. If it is, it is passed to a function that will execute the commands for the node asynchronously. When the commands have completed, all the node's parents have their unmade children counter decremented and, if the counter is then 0, they are placed on the examination queue. Likewise, if the node is up-to-date. Only those parents that were marked on the downward pass are processed in this way. Thus PMake traverses the graph back up to the nodes the user instructed it to create. When the examination queue is empty and no shells are running to create a target, PMake is finished. .LP Once all targets have been processed, PMake executes the commands attached to the .CW .END target, either explicitly or through the use of an ellipsis in a shell script. If there were no errors during the entire process but there are still some targets unmade (PMake keeps a running count of how many targets are left to be made), there is a cycle in the graph. PMake does a depth-first traversal of the graph to find all the targets that weren't made and prints them out one by one. .xH 1 Answers to Exercises .IP (3.1) This is something of a trick question, for which I apologize. The trick comes from the UNIX definition of a suffix, which PMake doesn't necessarily share. You will have noticed that all the suffixes used in this tutorial (and in UNIX in general) begin with a period .CW .ms , ( .CW .c , etc.). Now, PMake's idea of a suffix is more like English's: it's the characters at the end of a word. With this in mind, one possible .Ix 0 def suffix solution to this problem goes as follows: .DS I \&.SUFFIXES : ec.exe .exe ec.obj .obj .asm ec.objec.exe .obj.exe : link -o $(.TARGET) $(.IMPSRC) \&.asmec.obj : asm -o $(.TARGET) -DDO_ERROR_CHECKING $(.IMPSRC) \&.asm.obj : asm -o $(.TARGET) $(.IMPSRC) .DE .IP (3.2) The trick to this one lies in the ``:='' variable-assignment operator and the ``:S'' variable-expansion modifier. .Ix 0 ref variable assignment expanded .Ix 0 ref variable expansion modified .Ix 0 ref modifier substitute .Ix 0 ref :S .Ix 0 ref := Basically what you want is to take the pointer variable, so to speak, and transform it into an invocation of the variable at which it points. You might try something like .DS I $(PTR:S/^/\e$(/:S/$/)) .DE which places .CW $( '' `` at the front of the variable name and .CW ) '' `` at the end, thus transforming .CW VAR ,'' `` for example, into .CW $(VAR) ,'' `` which is just what we want. Unfortunately (as you know if you've tried it), since, as it says in the hint, PMake does no further substitution on the result of a modified expansion, that's \fIall\fP you get. The solution is to make use of ``:='' to place that string into yet another variable, then invoke the other variable directly: .DS I *PTR := $(PTR:S/^/\e$(/:S/$/)/) .DE You can then use .CW $(*PTR) '' `` to your heart's content. .de Gp .XP \&\fB\\$1:\fP .. .xH 1 Glossary of Jargon .Gp "attribute" A property given to a target that causes PMake to treat it differently. .Gp "command script" The lines immediately following a dependency line that specify commands to execute to create each of the targets on the dependency line. Each line in the command script must begin with a tab. .Gp "command-line variable" A variable defined in an argument when PMake is first executed. Overrides all assignments to the same variable name in the makefile. .Gp "conditional" A construct much like that used in C that allows a makefile to be configured on the fly based on the local environment, or on what is being made by that invocation of PMake. .Gp "creation script" Commands used to create a target. See ``command script.'' .Gp "dependency" The relationship between a source and a target. This comes in three flavors, as indicated by the operator between the target and the source. `:' gives a straight time-wise dependency (if the target is older than the source, the target is out-of-date), while `!' provides simply an ordering and always considers the target out-of-date. `::' is much like `:', save it creates multiple instances of a target each of which depends on its own list of sources. .Gp "dynamic source" This refers to a source that has a local variable invocation in it. It allows a single dependency line to specify a different source for each target on the line. .Gp "global variable" Any variable defined in a makefile. Takes precedence over variables defined in the environment, but not over command-line or local variables. .Gp "input graph" What PMake constructs from a makefile. Consists of nodes made of the targets in the makefile, and the links between them (the dependencies). The links are directed (from source to target) and there may not be any cycles (loops) in the graph. .Gp "local variable" A variable defined by PMake visible only in a target's shell script. There are seven local variables, not all of which are defined for every target: .CW .TARGET , .CW .ALLSRC , .CW .OODATE , .CW .PREFIX , .CW .IMPSRC , .CW .ARCHIVE , and .CW .MEMBER . .CW .TARGET , .CW .PREFIX , .CW .ARCHIVE , and .CW .MEMBER may be used on dependency lines to create ``dynamic sources.'' .Gp "makefile" A file that describes how a system is built. If you don't know what it is after reading this tutorial.\|.\|.\|. .Gp "modifier" A letter, following a colon, used to alter how a variable is expanded. It has no effect on the variable itself. .Gp "operator" What separates a source from a target (on a dependency line) and specifies the relationship between the two. There are three: .CW : ', ` .CW :: ', ` and .CW ! '. ` .Gp "search path" A list of directories in which a file should be sought. PMake's view of the contents of directories in a search path does not change once the makefile has been read. A file is sought on a search path only if it is exclusively a source. .Gp "shell" A program to which commands are passed in order to create targets. .Gp "source" Anything to the right of an operator on a dependency line. Targets on the dependency line are usually created from the sources. .Gp "special target" A target that causes PMake to do special things when it's encountered. .Gp "suffix" The tail end of a file name. Usually begins with a period, .CW .c or .CW .ms , e.g. .Gp "target" A word to the left of the operator on a dependency line. More generally, any file that PMake might create. A file may be (and often is) both a target and a source (what it is depends on how PMake is looking at it at the time \*- sort of like the wave/particle duality of light, you know). .Gp "transformation rule" A special construct in a makefile that specifies how to create a file of one type from a file of another, as indicated by their suffixes. .Gp "variable expansion" The process of substituting the value of a variable for a reference to it. Expansion may be altered by means of modifiers. .Gp "variable" A place in which to store text that may be retrieved later. Also used to define the local environment. Conditionals exist that test whether a variable is defined or not. .bp .\" Output table of contents last, with an entry for the index, making .\" sure to save and restore the last real page number for the index... .nr @n \n(PN+1 .\" We are not generating an index .\" .XS \n(@n .\" Index .\" .XE .nr %% \n% .PX .nr % \n(%% diff --git a/VERSION b/VERSION index 6dfd755ffdc8..70e0f68a60b0 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ # keep this compatible with sh and make -_MAKE_VERSION=20201117 +_MAKE_VERSION=20210110 diff --git a/arch.c b/arch.c index 81552dee2bb9..037f6bc548cf 100644 --- a/arch.c +++ b/arch.c @@ -1,1123 +1,1140 @@ -/* $NetBSD: arch.c,v 1.177 2020/11/14 21:29:44 rillig Exp $ */ +/* $NetBSD: arch.c,v 1.193 2021/01/09 16:06:09 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* Manipulate libraries, archives and their members. +/* + * Manipulate libraries, archives and their members. * * The first time an archive is referenced, all of its members' headers are * read and cached and the archive closed again. All cached archives are kept * on a list which is searched each time an archive member is referenced. * * The interface to this module is: * * Arch_Init Initialize this module. * * Arch_End Clean up this module. * * Arch_ParseArchive * Parse an archive specification such as * "archive.a(member1 member2)". * * Arch_Touch Alter the modification time of the archive * member described by the given node to be * the time when make was started. * * Arch_TouchLib Update the modification time of the library * described by the given node. This is special * because it also updates the modification time * of the library's table of contents. * * Arch_UpdateMTime * Find the modification time of a member of * an archive *in the archive* and place it in the * member's GNode. * * Arch_UpdateMemberMTime * Find the modification time of a member of * an archive. Called when the member doesn't * already exist. Looks in the archive for the * modification time. Returns the modification * time. * * Arch_FindLib Search for a library along a path. The * library name in the GNode should be in * -l format. * * Arch_LibOODate Decide if a library node is out-of-date. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include #include #include #include #ifdef HAVE_AR_H #include #else struct ar_hdr { char ar_name[16]; /* name */ char ar_date[12]; /* modification time */ char ar_uid[6]; /* user id */ char ar_gid[6]; /* group id */ char ar_mode[8]; /* octal file permissions */ char ar_size[10]; /* size in bytes */ #ifndef ARFMAG #define ARFMAG "`\n" #endif char ar_fmag[2]; /* consistency check */ }; #endif #if defined(HAVE_RANLIB_H) && !(defined(__ELF__) || defined(NO_RANLIB)) #include #endif #ifdef HAVE_UTIME_H #include #endif #include "make.h" #include "dir.h" /* "@(#)arch.c 8.2 (Berkeley) 1/2/94" */ -MAKE_RCSID("$NetBSD: arch.c,v 1.177 2020/11/14 21:29:44 rillig Exp $"); +MAKE_RCSID("$NetBSD: arch.c,v 1.193 2021/01/09 16:06:09 rillig Exp $"); typedef struct List ArchList; typedef struct ListNode ArchListNode; -static ArchList *archives; /* The archives we've already examined */ +static ArchList archives; /* The archives we've already examined */ typedef struct Arch { - char *name; /* Name of archive */ - HashTable members; /* All the members of the archive described + char *name; /* Name of archive */ + HashTable members; /* All the members of the archive described * by key/value pairs */ - char *fnametab; /* Extended name table strings */ - size_t fnamesize; /* Size of the string table */ + char *fnametab; /* Extended name table strings */ + size_t fnamesize; /* Size of the string table */ } Arch; static FILE *ArchFindMember(const char *, const char *, struct ar_hdr *, const char *); #if defined(__svr4__) || defined(__SVR4) || defined(__ELF__) #define SVR4ARCHIVES static int ArchSVR4Entry(Arch *, char *, size_t, FILE *); #endif #if defined(_AIX) # define AR_NAME _ar_name.ar_name # define AR_FMAG _ar_name.ar_fmag # define SARMAG SAIAMAG # define ARMAG AIAMAG # define ARFMAG AIAFMAG #endif #ifndef AR_NAME # define AR_NAME ar_name #endif #ifndef AR_DATE # define AR_DATE ar_date #endif #ifndef AR_SIZE # define AR_SIZE ar_size #endif #ifndef AR_FMAG # define AR_FMAG ar_fmag #endif #ifndef ARMAG # define ARMAG "!\n" #endif #ifndef SARMAG # define SARMAG 8 #endif #ifdef CLEANUP static void ArchFree(void *ap) { - Arch *a = ap; - HashIter hi; - - /* Free memory from hash entries */ - HashIter_Init(&hi, &a->members); - while (HashIter_Next(&hi) != NULL) - free(hi.entry->value); - - free(a->name); - free(a->fnametab); - HashTable_Done(&a->members); - free(a); + Arch *a = ap; + HashIter hi; + + /* Free memory from hash entries */ + HashIter_Init(&hi, &a->members); + while (HashIter_Next(&hi) != NULL) + free(hi.entry->value); + + free(a->name); + free(a->fnametab); + HashTable_Done(&a->members); + free(a); } #endif /* * Parse an archive specification such as "archive.a(member1 member2.${EXT})", - * adding nodes for the expanded members to nodeLst. Nodes are created as + * adding nodes for the expanded members to gns. Nodes are created as * necessary. * * Input: * pp The start of the specification. - * nodeLst The list on which to place the nodes. + * gns The list on which to place the nodes. * ctxt The context in which to expand variables. * * Output: * return TRUE if it was a valid specification. * *pp Points to the first non-space after the archive spec. - * *nodeLst Nodes for the members have been added. */ Boolean -Arch_ParseArchive(char **pp, GNodeList *nodeLst, GNode *ctxt) +Arch_ParseArchive(char **pp, GNodeList *gns, GNode *ctxt) { - char *cp; /* Pointer into line */ - GNode *gn; /* New node */ - char *libName; /* Library-part of specification */ - char *libName_freeIt = NULL; - char *memName; /* Member-part of specification */ - char saveChar; /* Ending delimiter of member-name */ - Boolean expandLibName; /* Whether the parsed libName contains + char *cp; /* Pointer into line */ + GNode *gn; /* New node */ + MFStr libName; /* Library-part of specification */ + char *memName; /* Member-part of specification */ + char saveChar; /* Ending delimiter of member-name */ + Boolean expandLibName; /* Whether the parsed libName contains * variable expressions that need to be * expanded */ - libName = *pp; - expandLibName = FALSE; - - for (cp = libName; *cp != '(' && *cp != '\0';) { - if (*cp == '$') { - /* - * Variable spec, so call the Var module to parse the puppy - * so we can safely advance beyond it... - */ - const char *nested_p = cp; - void *result_freeIt; - const char *result; - Boolean isError; - - /* XXX: is expanded twice: once here and once below */ - (void)Var_Parse(&nested_p, ctxt, VARE_WANTRES | VARE_UNDEFERR, - &result, &result_freeIt); - /* TODO: handle errors */ - isError = result == var_Error; - free(result_freeIt); - if (isError) - return FALSE; - - expandLibName = TRUE; - cp += nested_p - cp; - } else - cp++; - } - - *cp++ = '\0'; - if (expandLibName) { - (void)Var_Subst(libName, ctxt, VARE_WANTRES | VARE_UNDEFERR, &libName); - /* TODO: handle errors */ - libName_freeIt = libName; - } - - - for (;;) { - /* - * First skip to the start of the member's name, mark that - * place and skip to the end of it (either white-space or - * a close paren). - */ - Boolean doSubst = FALSE; /* TRUE if need to substitute in memName */ - - pp_skip_whitespace(&cp); - - memName = cp; - while (*cp != '\0' && *cp != ')' && !ch_isspace(*cp)) { - if (*cp == '$') { - /* - * Variable spec, so call the Var module to parse the puppy - * so we can safely advance beyond it... - */ - void *freeIt; - const char *result; - Boolean isError; - const char *nested_p = cp; - - (void)Var_Parse(&nested_p, ctxt, VARE_WANTRES | VARE_UNDEFERR, - &result, &freeIt); - /* TODO: handle errors */ - isError = result == var_Error; - free(freeIt); - - if (isError) - return FALSE; - - doSubst = TRUE; - cp += nested_p - cp; - } else { - cp++; - } - } - - /* - * If the specification ends without a closing parenthesis, - * chances are there's something wrong (like a missing backslash), - * so it's better to return failure than allow such things to happen - */ - if (*cp == '\0') { - Parse_Error(PARSE_FATAL, "No closing parenthesis in archive specification"); - return FALSE; + libName = MFStr_InitRefer(*pp); + expandLibName = FALSE; + + for (cp = libName.str; *cp != '(' && *cp != '\0';) { + if (*cp == '$') { + /* Expand nested variable expressions. */ + /* XXX: This code can probably be shortened. */ + const char *nested_p = cp; + FStr result; + Boolean isError; + + /* XXX: is expanded twice: once here and once below */ + (void)Var_Parse(&nested_p, ctxt, + VARE_WANTRES | VARE_UNDEFERR, &result); + /* TODO: handle errors */ + isError = result.str == var_Error; + FStr_Done(&result); + if (isError) + return FALSE; + + expandLibName = TRUE; + cp += nested_p - cp; + } else + cp++; } - /* - * If we didn't move anywhere, we must be done - */ - if (cp == memName) { - break; + *cp++ = '\0'; + if (expandLibName) { + char *expanded; + (void)Var_Subst(libName.str, ctxt, + VARE_WANTRES | VARE_UNDEFERR, &expanded); + /* TODO: handle errors */ + libName = MFStr_InitOwn(expanded); } - saveChar = *cp; - *cp = '\0'; - /* - * XXX: This should be taken care of intelligently by - * SuffExpandChildren, both for the archive and the member portions. - */ - /* - * If member contains variables, try and substitute for them. - * This will slow down archive specs with dynamic sources, of course, - * since we'll be (non-)substituting them three times, but them's - * the breaks -- we need to do this since SuffExpandChildren calls - * us, otherwise we could assume the thing would be taken care of - * later. - */ - if (doSubst) { - char *buf; - char *sacrifice; - char *oldMemName = memName; - - (void)Var_Subst(memName, ctxt, VARE_WANTRES | VARE_UNDEFERR, - &memName); - /* TODO: handle errors */ - - /* - * Now form an archive spec and recurse to deal with nested - * variables and multi-word variable values.... The results - * are just placed at the end of the nodeLst we're returning. - */ - buf = sacrifice = str_concat4(libName, "(", memName, ")"); - - if (strchr(memName, '$') != NULL && - strcmp(memName, oldMemName) == 0) { + for (;;) { /* - * Must contain dynamic sources, so we can't deal with it now. - * Just create an ARCHV node for the thing and let - * SuffExpandChildren handle it... + * First skip to the start of the member's name, mark that + * place and skip to the end of it (either white-space or + * a close paren). */ - gn = Targ_GetNode(buf); - gn->type |= OP_ARCHV; - Lst_Append(nodeLst, gn); - - } else if (!Arch_ParseArchive(&sacrifice, nodeLst, ctxt)) { - /* Error in nested call. */ - free(buf); - return FALSE; - } - free(buf); + Boolean doSubst = FALSE; + + pp_skip_whitespace(&cp); + + memName = cp; + while (*cp != '\0' && *cp != ')' && !ch_isspace(*cp)) { + if (*cp == '$') { + /* Expand nested variable expressions. */ + /* XXX: This code can probably be shortened. */ + FStr result; + Boolean isError; + const char *nested_p = cp; + + (void)Var_Parse(&nested_p, ctxt, + VARE_WANTRES | VARE_UNDEFERR, + &result); + /* TODO: handle errors */ + isError = result.str == var_Error; + FStr_Done(&result); + + if (isError) + return FALSE; + + doSubst = TRUE; + cp += nested_p - cp; + } else { + cp++; + } + } - } else if (Dir_HasWildcards(memName)) { - StringList *members = Lst_New(); - Dir_Expand(memName, dirSearchPath, members); + /* + * If the specification ends without a closing parenthesis, + * chances are there's something wrong (like a missing + * backslash), so it's better to return failure than allow + * such things to happen + */ + if (*cp == '\0') { + Parse_Error(PARSE_FATAL, + "No closing parenthesis " + "in archive specification"); + return FALSE; + } - while (!Lst_IsEmpty(members)) { - char *member = Lst_Dequeue(members); - char *fullname = str_concat4(libName, "(", member, ")"); - free(member); + /* + * If we didn't move anywhere, we must be done + */ + if (cp == memName) + break; - gn = Targ_GetNode(fullname); - free(fullname); + saveChar = *cp; + *cp = '\0'; - gn->type |= OP_ARCHV; - Lst_Append(nodeLst, gn); - } - Lst_Free(members); + /* + * XXX: This should be taken care of intelligently by + * SuffExpandChildren, both for the archive and the member + * portions. + */ + /* + * If member contains variables, try and substitute for them. + * This will slow down archive specs with dynamic sources, of + * course, since we'll be (non-)substituting them three + * times, but them's the breaks -- we need to do this since + * SuffExpandChildren calls us, otherwise we could assume the + * thing would be taken care of later. + */ + if (doSubst) { + char *fullName; + char *p; + char *unexpandedMemName = memName; + + (void)Var_Subst(memName, ctxt, + VARE_WANTRES | VARE_UNDEFERR, + &memName); + /* TODO: handle errors */ + + /* + * Now form an archive spec and recurse to deal with + * nested variables and multi-word variable values. + */ + fullName = str_concat4(libName.str, "(", memName, ")"); + p = fullName; + + if (strchr(memName, '$') != NULL && + strcmp(memName, unexpandedMemName) == 0) { + /* + * Must contain dynamic sources, so we can't + * deal with it now. Just create an ARCHV node + * for the thing and let SuffExpandChildren + * handle it. + */ + gn = Targ_GetNode(fullName); + gn->type |= OP_ARCHV; + Lst_Append(gns, gn); + + } else if (!Arch_ParseArchive(&p, gns, ctxt)) { + /* Error in nested call. */ + free(fullName); + /* XXX: does unexpandedMemName leak? */ + return FALSE; + } + free(fullName); + /* XXX: does unexpandedMemName leak? */ + + } else if (Dir_HasWildcards(memName)) { + StringList members = LST_INIT; + Dir_Expand(memName, &dirSearchPath, &members); + + while (!Lst_IsEmpty(&members)) { + char *member = Lst_Dequeue(&members); + char *fullname = str_concat4(libName.str, "(", + member, ")"); + free(member); + + gn = Targ_GetNode(fullname); + free(fullname); + + gn->type |= OP_ARCHV; + Lst_Append(gns, gn); + } + Lst_Done(&members); + + } else { + char *fullname = str_concat4(libName.str, "(", memName, + ")"); + gn = Targ_GetNode(fullname); + free(fullname); + + /* + * We've found the node, but have to make sure the + * rest of the world knows it's an archive member, + * without having to constantly check for parentheses, + * so we type the thing with the OP_ARCHV bit before + * we place it on the end of the provided list. + */ + gn->type |= OP_ARCHV; + Lst_Append(gns, gn); + } + if (doSubst) + free(memName); - } else { - char *fullname = str_concat4(libName, "(", memName, ")"); - gn = Targ_GetNode(fullname); - free(fullname); - - /* - * We've found the node, but have to make sure the rest of the - * world knows it's an archive member, without having to - * constantly check for parentheses, so we type the thing with - * the OP_ARCHV bit before we place it on the end of the - * provided list. - */ - gn->type |= OP_ARCHV; - Lst_Append(nodeLst, gn); + *cp = saveChar; } - if (doSubst) { - free(memName); - } - - *cp = saveChar; - } - free(libName_freeIt); + MFStr_Done(&libName); - cp++; /* skip the ')' */ - /* We promised that pp would be set up at the next non-space. */ - pp_skip_whitespace(&cp); - *pp = cp; - return TRUE; + cp++; /* skip the ')' */ + /* We promised that pp would be set up at the next non-space. */ + pp_skip_whitespace(&cp); + *pp = cp; + return TRUE; } -/* Locate a member of an archive, given the path of the archive and the path +/* + * Locate a member of an archive, given the path of the archive and the path * of the desired member. * * Input: * archive Path to the archive * member Name of member; only its basename is used. * addToCache TRUE if archive should be cached if not already so. * * Results: * The ar_hdr for the member, or NULL. * * See ArchFindMember for an almost identical copy of this code. */ static struct ar_hdr * ArchStatMember(const char *archive, const char *member, Boolean addToCache) { -#define AR_MAX_NAME_LEN (sizeof arh.AR_NAME - 1) - FILE *arch; /* Stream to archive */ - size_t size; /* Size of archive member */ - char magic[SARMAG]; - ArchListNode *ln; - Arch *ar; /* Archive descriptor */ - struct ar_hdr arh; /* archive-member header for reading archive */ - char memName[MAXPATHLEN + 1]; - /* Current member name while hashing. */ - - /* - * Because of space constraints and similar things, files are archived - * using their basename, not the entire path. - */ - const char *lastSlash = strrchr(member, '/'); - if (lastSlash != NULL) - member = lastSlash + 1; - - for (ln = archives->first; ln != NULL; ln = ln->next) { - const Arch *a = ln->datum; - if (strcmp(a->name, archive) == 0) - break; - } - - if (ln != NULL) { - struct ar_hdr *hdr; - - ar = ln->datum; - hdr = HashTable_FindValue(&ar->members, member); - if (hdr != NULL) - return hdr; - - { - /* Try truncated name */ - char copy[AR_MAX_NAME_LEN + 1]; - size_t len = strlen(member); - - if (len > AR_MAX_NAME_LEN) { - len = AR_MAX_NAME_LEN; - snprintf(copy, sizeof copy, "%s", member); - hdr = HashTable_FindValue(&ar->members, copy); - } - return hdr; - } - } +#define AR_MAX_NAME_LEN (sizeof arh.ar_name - 1) + FILE *arch; + size_t size; /* Size of archive member */ + char magic[SARMAG]; + ArchListNode *ln; + Arch *ar; /* Archive descriptor */ + struct ar_hdr arh; /* archive-member header for reading archive */ + char memName[MAXPATHLEN + 1]; + /* Current member name while hashing. */ - if (!addToCache) { /* - * Caller doesn't want the thing cached, just use ArchFindMember - * to read the header for the member out and close down the stream - * again. Since the archive is not to be cached, we assume there's - * no need to allocate extra room for the header we're returning, - * so just declare it static. + * Because of space constraints and similar things, files are archived + * using their basename, not the entire path. */ - static struct ar_hdr sarh; + member = str_basename(member); - arch = ArchFindMember(archive, member, &sarh, "r"); - if (arch == NULL) - return NULL; + for (ln = archives.first; ln != NULL; ln = ln->next) { + const Arch *a = ln->datum; + if (strcmp(a->name, archive) == 0) + break; + } - fclose(arch); - return &sarh; - } - - /* - * We don't have this archive on the list yet, so we want to find out - * everything that's in it and cache it so we can get at it quickly. - */ - arch = fopen(archive, "r"); - if (arch == NULL) - return NULL; + if (ln != NULL) { + struct ar_hdr *hdr; - /* - * We use the ARMAG string to make sure this is an archive we - * can handle... - */ - if (fread(magic, SARMAG, 1, arch) != 1 || - strncmp(magic, ARMAG, SARMAG) != 0) { - (void)fclose(arch); - return NULL; - } + ar = ln->datum; + hdr = HashTable_FindValue(&ar->members, member); + if (hdr != NULL) + return hdr; - ar = bmake_malloc(sizeof *ar); - ar->name = bmake_strdup(archive); - ar->fnametab = NULL; - ar->fnamesize = 0; - HashTable_Init(&ar->members); - memName[AR_MAX_NAME_LEN] = '\0'; + { + /* Try truncated name */ + char copy[AR_MAX_NAME_LEN + 1]; + size_t len = strlen(member); - while (fread(&arh, sizeof arh, 1, arch) == 1) { - char *nameend; + if (len > AR_MAX_NAME_LEN) { + snprintf(copy, sizeof copy, "%s", member); + hdr = HashTable_FindValue(&ar->members, copy); + } + return hdr; + } + } + + if (!addToCache) { + /* + * Caller doesn't want the thing cached, just use + * ArchFindMember to read the header for the member out and + * close down the stream again. Since the archive is not to be + * cached, we assume there's no need to allocate extra room + * for the header we're returning, so just declare it static. + */ + static struct ar_hdr sarh; - /* If the header is bogus, there's no way we can recover. */ - if (strncmp(arh.AR_FMAG, ARFMAG, sizeof arh.AR_FMAG) != 0) - goto badarch; + arch = ArchFindMember(archive, member, &sarh, "r"); + if (arch == NULL) + return NULL; + + fclose(arch); + return &sarh; + } /* - * We need to advance the stream's pointer to the start of the - * next header. Files are padded with newlines to an even-byte - * boundary, so we need to extract the size of the file from the - * 'size' field of the header and round it up during the seek. + * We don't have this archive on the list yet, so we want to find out + * everything that's in it and cache it so we can get at it quickly. */ - arh.AR_SIZE[sizeof arh.AR_SIZE - 1] = '\0'; - size = (size_t)strtol(arh.AR_SIZE, NULL, 10); - - memcpy(memName, arh.AR_NAME, sizeof arh.AR_NAME); - nameend = memName + AR_MAX_NAME_LEN; - while (nameend > memName && *nameend == ' ') - nameend--; - nameend[1] = '\0'; + arch = fopen(archive, "r"); + if (arch == NULL) + return NULL; -#ifdef SVR4ARCHIVES /* - * svr4 names are slash terminated. Also svr4 extended AR format. + * We use the ARMAG string to make sure this is an archive we + * can handle... */ - if (memName[0] == '/') { - /* - * svr4 magic mode; handle it - */ - switch (ArchSVR4Entry(ar, memName, size, arch)) { - case -1: /* Invalid data */ - goto badarch; - case 0: /* List of files entry */ - continue; - default: /* Got the entry */ - break; - } - } else { - if (nameend[0] == '/') - nameend[0] = '\0'; + if (fread(magic, SARMAG, 1, arch) != 1 || + strncmp(magic, ARMAG, SARMAG) != 0) { + (void)fclose(arch); + return NULL; } + + ar = bmake_malloc(sizeof *ar); + ar->name = bmake_strdup(archive); + ar->fnametab = NULL; + ar->fnamesize = 0; + HashTable_Init(&ar->members); + memName[AR_MAX_NAME_LEN] = '\0'; + + while (fread(&arh, sizeof arh, 1, arch) == 1) { + char *nameend; + + /* If the header is bogus, there's no way we can recover. */ + if (strncmp(arh.AR_FMAG, ARFMAG, sizeof arh.AR_FMAG) != 0) + goto badarch; + + /* + * We need to advance the stream's pointer to the start of the + * next header. Files are padded with newlines to an even-byte + * boundary, so we need to extract the size of the file from + * the 'size' field of the header and round it up during the + * seek. + */ + arh.AR_SIZE[sizeof arh.AR_SIZE - 1] = '\0'; + size = (size_t)strtol(arh.AR_SIZE, NULL, 10); + + memcpy(memName, arh.AR_NAME, sizeof arh.AR_NAME); + nameend = memName + AR_MAX_NAME_LEN; + while (nameend > memName && *nameend == ' ') + nameend--; + nameend[1] = '\0'; + +#ifdef SVR4ARCHIVES + /* + * svr4 names are slash-terminated. + * Also svr4 extended the AR format. + */ + if (memName[0] == '/') { + /* svr4 magic mode; handle it */ + switch (ArchSVR4Entry(ar, memName, size, arch)) { + case -1: /* Invalid data */ + goto badarch; + case 0: /* List of files entry */ + continue; + default: /* Got the entry */ + break; + } + } else { + if (nameend[0] == '/') + nameend[0] = '\0'; + } #endif #ifdef AR_EFMT1 - /* - * BSD 4.4 extended AR format: #1/, with name as the - * first bytes of the file - */ - if (strncmp(memName, AR_EFMT1, sizeof AR_EFMT1 - 1) == 0 && - ch_isdigit(memName[sizeof AR_EFMT1 - 1])) { - - int elen = atoi(memName + sizeof AR_EFMT1 - 1); - - if ((unsigned int)elen > MAXPATHLEN) - goto badarch; - if (fread(memName, (size_t)elen, 1, arch) != 1) - goto badarch; - memName[elen] = '\0'; - if (fseek(arch, -elen, SEEK_CUR) != 0) - goto badarch; - if (DEBUG(ARCH) || DEBUG(MAKE)) - debug_printf("ArchStatMember: Extended format entry for %s\n", - memName); - } + /* + * BSD 4.4 extended AR format: #1/, with name as the + * first bytes of the file + */ + if (strncmp(memName, AR_EFMT1, sizeof AR_EFMT1 - 1) == 0 && + ch_isdigit(memName[sizeof AR_EFMT1 - 1])) { + + int elen = atoi(memName + sizeof AR_EFMT1 - 1); + + if ((unsigned int)elen > MAXPATHLEN) + goto badarch; + if (fread(memName, (size_t)elen, 1, arch) != 1) + goto badarch; + memName[elen] = '\0'; + if (fseek(arch, -elen, SEEK_CUR) != 0) + goto badarch; + if (DEBUG(ARCH) || DEBUG(MAKE)) + debug_printf( + "ArchStatMember: " + "Extended format entry for %s\n", + memName); + } #endif - { - struct ar_hdr *cached_hdr = bmake_malloc(sizeof *cached_hdr); - memcpy(cached_hdr, &arh, sizeof arh); - HashTable_Set(&ar->members, memName, cached_hdr); - } + { + struct ar_hdr *cached_hdr = bmake_malloc( + sizeof *cached_hdr); + memcpy(cached_hdr, &arh, sizeof arh); + HashTable_Set(&ar->members, memName, cached_hdr); + } - if (fseek(arch, ((long)size + 1) & ~1, SEEK_CUR) != 0) - goto badarch; - } + if (fseek(arch, ((long)size + 1) & ~1, SEEK_CUR) != 0) + goto badarch; + } - fclose(arch); + fclose(arch); - Lst_Append(archives, ar); + Lst_Append(&archives, ar); - /* - * Now that the archive has been read and cached, we can look into - * the addToCache table to find the desired member's header. - */ - return HashTable_FindValue(&ar->members, member); + /* + * Now that the archive has been read and cached, we can look into + * the addToCache table to find the desired member's header. + */ + return HashTable_FindValue(&ar->members, member); badarch: - fclose(arch); - HashTable_Done(&ar->members); - free(ar->fnametab); - free(ar); - return NULL; + fclose(arch); + HashTable_Done(&ar->members); + free(ar->fnametab); + free(ar); + return NULL; } #ifdef SVR4ARCHIVES -/*- - *----------------------------------------------------------------------- - * ArchSVR4Entry -- - * Parse an SVR4 style entry that begins with a slash. - * If it is "//", then load the table of filenames - * If it is "/", then try to substitute the long file name - * from offset of a table previously read. - * If a table is read, the file pointer is moved to the next archive - * member. +/* + * Parse an SVR4 style entry that begins with a slash. + * If it is "//", then load the table of filenames. + * If it is "/", then try to substitute the long file name + * from offset of a table previously read. + * If a table is read, the file pointer is moved to the next archive member. * * Results: * -1: Bad data in archive * 0: A table was loaded from the file * 1: Name was successfully substituted from table * 2: Name was not successfully substituted from table - *----------------------------------------------------------------------- */ static int ArchSVR4Entry(Arch *ar, char *inout_name, size_t size, FILE *arch) { #define ARLONGNAMES1 "//" #define ARLONGNAMES2 "/ARFILENAMES" - size_t entry; - char *ptr, *eptr; + size_t entry; + char *ptr, *eptr; - if (strncmp(inout_name, ARLONGNAMES1, sizeof ARLONGNAMES1 - 1) == 0 || - strncmp(inout_name, ARLONGNAMES2, sizeof ARLONGNAMES2 - 1) == 0) { + if (strncmp(inout_name, ARLONGNAMES1, sizeof ARLONGNAMES1 - 1) == 0 || + strncmp(inout_name, ARLONGNAMES2, sizeof ARLONGNAMES2 - 1) == 0) { - if (ar->fnametab != NULL) { - DEBUG0(ARCH, "Attempted to redefine an SVR4 name table\n"); - return -1; + if (ar->fnametab != NULL) { + DEBUG0(ARCH, + "Attempted to redefine an SVR4 name table\n"); + return -1; + } + + /* + * This is a table of archive names, so we build one for + * ourselves + */ + ar->fnametab = bmake_malloc(size); + ar->fnamesize = size; + + if (fread(ar->fnametab, size, 1, arch) != 1) { + DEBUG0(ARCH, "Reading an SVR4 name table failed\n"); + return -1; + } + eptr = ar->fnametab + size; + for (entry = 0, ptr = ar->fnametab; ptr < eptr; ptr++) + if (*ptr == '/') { + entry++; + *ptr = '\0'; + } + DEBUG1(ARCH, "Found svr4 archive name table with %lu entries\n", + (unsigned long)entry); + return 0; } - /* - * This is a table of archive names, so we build one for - * ourselves - */ - ar->fnametab = bmake_malloc(size); - ar->fnamesize = size; + if (inout_name[1] == ' ' || inout_name[1] == '\0') + return 2; - if (fread(ar->fnametab, size, 1, arch) != 1) { - DEBUG0(ARCH, "Reading an SVR4 name table failed\n"); - return -1; + entry = (size_t)strtol(&inout_name[1], &eptr, 0); + if ((*eptr != ' ' && *eptr != '\0') || eptr == &inout_name[1]) { + DEBUG1(ARCH, "Could not parse SVR4 name %s\n", inout_name); + return 2; + } + if (entry >= ar->fnamesize) { + DEBUG2(ARCH, "SVR4 entry offset %s is greater than %lu\n", + inout_name, (unsigned long)ar->fnamesize); + return 2; } - eptr = ar->fnametab + size; - for (entry = 0, ptr = ar->fnametab; ptr < eptr; ptr++) - if (*ptr == '/') { - entry++; - *ptr = '\0'; - } - DEBUG1(ARCH, "Found svr4 archive name table with %lu entries\n", - (unsigned long)entry); - return 0; - } - - if (inout_name[1] == ' ' || inout_name[1] == '\0') - return 2; - - entry = (size_t)strtol(&inout_name[1], &eptr, 0); - if ((*eptr != ' ' && *eptr != '\0') || eptr == &inout_name[1]) { - DEBUG1(ARCH, "Could not parse SVR4 name %s\n", inout_name); - return 2; - } - if (entry >= ar->fnamesize) { - DEBUG2(ARCH, "SVR4 entry offset %s is greater than %lu\n", - inout_name, (unsigned long)ar->fnamesize); - return 2; - } - - DEBUG2(ARCH, "Replaced %s with %s\n", inout_name, &ar->fnametab[entry]); - - snprintf(inout_name, MAXPATHLEN + 1, "%s", &ar->fnametab[entry]); - return 1; + + DEBUG2(ARCH, "Replaced %s with %s\n", inout_name, &ar->fnametab[entry]); + + snprintf(inout_name, MAXPATHLEN + 1, "%s", &ar->fnametab[entry]); + return 1; } #endif static Boolean ArchiveMember_HasName(const struct ar_hdr *hdr, const char *name, size_t namelen) { - const size_t ar_name_len = sizeof hdr->AR_NAME; - const char *ar_name = hdr->AR_NAME; + const size_t ar_name_len = sizeof hdr->AR_NAME; + const char *ar_name = hdr->AR_NAME; - if (strncmp(ar_name, name, namelen) != 0) - return FALSE; + if (strncmp(ar_name, name, namelen) != 0) + return FALSE; - if (namelen >= ar_name_len) - return namelen == ar_name_len; + if (namelen >= ar_name_len) + return namelen == ar_name_len; - /* hdr->AR_NAME is space-padded to the right. */ - if (ar_name[namelen] == ' ') - return TRUE; + /* hdr->AR_NAME is space-padded to the right. */ + if (ar_name[namelen] == ' ') + return TRUE; - /* In archives created by GNU binutils 2.27, the member names end with - * a slash. */ - if (ar_name[namelen] == '/' && - (namelen == ar_name_len || ar_name[namelen + 1] == ' ')) - return TRUE; + /* In archives created by GNU binutils 2.27, the member names end with + * a slash. */ + if (ar_name[namelen] == '/' && + (namelen == ar_name_len || ar_name[namelen + 1] == ' ')) + return TRUE; - return FALSE; + return FALSE; } -/* Locate a member of an archive, given the path of the archive and the path +/* + * Locate a member of an archive, given the path of the archive and the path * of the desired member. * * Input: * archive Path to the archive * member Name of member. If it is a path, only the last * component is used. * out_arh Archive header to be filled in * mode "r" for read-only access, "r+" for read-write access * * Output: * return The archive file, positioned at the start of the * member's struct ar_hdr, or NULL if the member doesn't * exist. * *out_arh The current struct ar_hdr for member. * * See ArchStatMember for an almost identical copy of this code. */ static FILE * ArchFindMember(const char *archive, const char *member, struct ar_hdr *out_arh, const char *mode) { - FILE *arch; /* Stream to archive */ - int size; /* Size of archive member */ - char magic[SARMAG]; - size_t len, tlen; - const char *lastSlash; - - arch = fopen(archive, mode); - if (arch == NULL) - return NULL; + FILE *arch; /* Stream to archive */ + int size; /* Size of archive member */ + char magic[SARMAG]; + size_t len; - /* - * We use the ARMAG string to make sure this is an archive we - * can handle... - */ - if (fread(magic, SARMAG, 1, arch) != 1 || - strncmp(magic, ARMAG, SARMAG) != 0) { - fclose(arch); - return NULL; - } - - /* - * Because of space constraints and similar things, files are archived - * using their basename, not the entire path. - */ - lastSlash = strrchr(member, '/'); - if (lastSlash != NULL) - member = lastSlash + 1; - - len = tlen = strlen(member); - if (len > sizeof out_arh->AR_NAME) { - tlen = sizeof out_arh->AR_NAME; - } - - while (fread(out_arh, sizeof *out_arh, 1, arch) == 1) { - - if (strncmp(out_arh->AR_FMAG, ARFMAG, sizeof out_arh->AR_FMAG) != 0) { - /* - * The header is bogus, so the archive is bad - * and there's no way we can recover... - */ - fclose(arch); - return NULL; - } + arch = fopen(archive, mode); + if (arch == NULL) + return NULL; - DEBUG5(ARCH, "Reading archive %s member %.*s mtime %.*s\n", - archive, - (int)sizeof out_arh->AR_NAME, out_arh->AR_NAME, - (int)sizeof out_arh->ar_date, out_arh->ar_date); - - if (ArchiveMember_HasName(out_arh, member, len)) { - /* - * To make life easier for callers that want to update the - * archive, we reposition the file at the start - * of the header we just read before we return the stream. - * In a more general situation, it might be better to leave - * the file at the actual member, rather than its header, but - * not here. - */ - if (fseek(arch, -(long)sizeof *out_arh, SEEK_CUR) != 0) { + /* + * We use the ARMAG string to make sure this is an archive we + * can handle... + */ + if (fread(magic, SARMAG, 1, arch) != 1 || + strncmp(magic, ARMAG, SARMAG) != 0) { fclose(arch); return NULL; - } - return arch; } -#ifdef AR_EFMT1 /* - * BSD 4.4 extended AR format: #1/, with name as the - * first bytes of the file + * Because of space constraints and similar things, files are archived + * using their basename, not the entire path. */ - if (strncmp(out_arh->AR_NAME, AR_EFMT1, sizeof AR_EFMT1 - 1) == 0 && - ch_isdigit(out_arh->AR_NAME[sizeof AR_EFMT1 - 1])) - { - int elen = atoi(&out_arh->AR_NAME[sizeof AR_EFMT1 - 1]); - char ename[MAXPATHLEN + 1]; + member = str_basename(member); - if ((unsigned int)elen > MAXPATHLEN) { - fclose(arch); - return NULL; - } - if (fread(ename, (size_t)elen, 1, arch) != 1) { - fclose(arch); - return NULL; - } - ename[elen] = '\0'; - if (DEBUG(ARCH) || DEBUG(MAKE)) - debug_printf("ArchFindMember: Extended format entry for %s\n", - ename); - if (strncmp(ename, member, len) == 0) { - /* Found as extended name */ - if (fseek(arch, -(long)sizeof(struct ar_hdr) - elen, - SEEK_CUR) != 0) { - fclose(arch); - return NULL; + len = strlen(member); + + while (fread(out_arh, sizeof *out_arh, 1, arch) == 1) { + + if (strncmp(out_arh->AR_FMAG, ARFMAG, + sizeof out_arh->AR_FMAG) != 0) { + /* + * The header is bogus, so the archive is bad + * and there's no way we can recover... + */ + fclose(arch); + return NULL; + } + + DEBUG5(ARCH, "Reading archive %s member %.*s mtime %.*s\n", + archive, + (int)sizeof out_arh->AR_NAME, out_arh->AR_NAME, + (int)sizeof out_arh->ar_date, out_arh->ar_date); + + if (ArchiveMember_HasName(out_arh, member, len)) { + /* + * To make life easier for callers that want to update + * the archive, we reposition the file at the start of + * the header we just read before we return the + * stream. In a more general situation, it might be + * better to leave the file at the actual member, + * rather than its header, but not here. + */ + if (fseek(arch, -(long)sizeof *out_arh, SEEK_CUR) != + 0) { + fclose(arch); + return NULL; + } + return arch; + } + +#ifdef AR_EFMT1 + /* + * BSD 4.4 extended AR format: #1/, with name as the + * first bytes of the file + */ + if (strncmp(out_arh->AR_NAME, AR_EFMT1, sizeof AR_EFMT1 - 1) == + 0 && + (ch_isdigit(out_arh->AR_NAME[sizeof AR_EFMT1 - 1]))) { + int elen = atoi(&out_arh->AR_NAME[sizeof AR_EFMT1 - 1]); + char ename[MAXPATHLEN + 1]; + + if ((unsigned int)elen > MAXPATHLEN) { + fclose(arch); + return NULL; + } + if (fread(ename, (size_t)elen, 1, arch) != 1) { + fclose(arch); + return NULL; + } + ename[elen] = '\0'; + if (DEBUG(ARCH) || DEBUG(MAKE)) + debug_printf( + "ArchFindMember: " + "Extended format entry for %s\n", + ename); + if (strncmp(ename, member, len) == 0) { + /* Found as extended name */ + if (fseek(arch, + -(long)sizeof(struct ar_hdr) - elen, + SEEK_CUR) != 0) { + fclose(arch); + return NULL; + } + return arch; + } + if (fseek(arch, -elen, SEEK_CUR) != 0) { + fclose(arch); + return NULL; + } } - return arch; - } - if (fseek(arch, -elen, SEEK_CUR) != 0) { - fclose(arch); - return NULL; - } - } #endif - /* - * This isn't the member we're after, so we need to advance the - * stream's pointer to the start of the next header. Files are - * padded with newlines to an even-byte boundary, so we need to - * extract the size of the file from the 'size' field of the - * header and round it up during the seek. - */ - out_arh->AR_SIZE[sizeof out_arh->AR_SIZE - 1] = '\0'; - size = (int)strtol(out_arh->AR_SIZE, NULL, 10); - if (fseek(arch, (size + 1) & ~1, SEEK_CUR) != 0) { - fclose(arch); - return NULL; + /* + * This isn't the member we're after, so we need to advance the + * stream's pointer to the start of the next header. Files are + * padded with newlines to an even-byte boundary, so we need to + * extract the size of the file from the 'size' field of the + * header and round it up during the seek. + */ + out_arh->AR_SIZE[sizeof out_arh->AR_SIZE - 1] = '\0'; + size = (int)strtol(out_arh->AR_SIZE, NULL, 10); + if (fseek(arch, (size + 1) & ~1, SEEK_CUR) != 0) { + fclose(arch); + return NULL; + } } - } - fclose(arch); - return NULL; + fclose(arch); + return NULL; } -/* Touch a member of an archive, on disk. +/* + * Touch a member of an archive, on disk. * The GNode's modification time is left as-is. * * The st_mtime of the entire archive is also changed. * For a library, it may be required to run ranlib after this. * * Input: * gn Node of member to touch * * Results: * The 'time' field of the member's header is updated. */ void Arch_Touch(GNode *gn) { - FILE *f; - struct ar_hdr arh; + FILE *f; + struct ar_hdr arh; - f = ArchFindMember(GNode_VarArchive(gn), GNode_VarMember(gn), &arh, "r+"); - if (f == NULL) - return; + f = ArchFindMember(GNode_VarArchive(gn), GNode_VarMember(gn), &arh, + "r+"); + if (f == NULL) + return; - snprintf(arh.ar_date, sizeof arh.ar_date, "%-ld", (unsigned long)now); - (void)fwrite(&arh, sizeof arh, 1, f); - fclose(f); /* TODO: handle errors */ + snprintf(arh.ar_date, sizeof arh.ar_date, "%-ld", (unsigned long)now); + (void)fwrite(&arh, sizeof arh, 1, f); + fclose(f); /* TODO: handle errors */ } -/* Given a node which represents a library, touch the thing, making sure that +/* + * Given a node which represents a library, touch the thing, making sure that * the table of contents is also touched. * * Both the modification time of the library and of the RANLIBMAG member are - * set to 'now'. */ + * set to 'now'. + */ +/*ARGSUSED*/ void Arch_TouchLib(GNode *gn MAKE_ATTR_UNUSED) { #ifdef RANLIBMAG - FILE *f; - struct ar_hdr arh; /* Header describing table of contents */ - struct utimbuf times; + FILE *f; + struct ar_hdr arh; /* Header describing table of contents */ + struct utimbuf times; - f = ArchFindMember(gn->path, RANLIBMAG, &arh, "r+"); - if (f == NULL) - return; + f = ArchFindMember(gn->path, RANLIBMAG, &arh, "r+"); + if (f == NULL) + return; - snprintf(arh.ar_date, sizeof arh.ar_date, "%-ld", (unsigned long)now); - (void)fwrite(&arh, sizeof arh, 1, f); - fclose(f); /* TODO: handle errors */ + snprintf(arh.ar_date, sizeof arh.ar_date, "%-ld", (unsigned long)now); + (void)fwrite(&arh, sizeof arh, 1, f); + fclose(f); /* TODO: handle errors */ - times.actime = times.modtime = now; - utime(gn->path, ×); /* TODO: handle errors */ + times.actime = times.modtime = now; + utime(gn->path, ×); /* TODO: handle errors */ #endif } -/* Update the mtime of the GNode with the mtime from the archive member on - * disk (or in the cache). */ +/* + * Update the mtime of the GNode with the mtime from the archive member on + * disk (or in the cache). + */ void Arch_UpdateMTime(GNode *gn) { - struct ar_hdr *arh; + struct ar_hdr *arh; - arh = ArchStatMember(GNode_VarArchive(gn), GNode_VarMember(gn), TRUE); - if (arh != NULL) - gn->mtime = (time_t)strtol(arh->ar_date, NULL, 10); - else - gn->mtime = 0; + arh = ArchStatMember(GNode_VarArchive(gn), GNode_VarMember(gn), TRUE); + if (arh != NULL) + gn->mtime = (time_t)strtol(arh->ar_date, NULL, 10); + else + gn->mtime = 0; } -/* Given a non-existent archive member's node, update gn->mtime from its - * archived form, if it exists. */ +/* + * Given a nonexistent archive member's node, update gn->mtime from its + * archived form, if it exists. + */ void Arch_UpdateMemberMTime(GNode *gn) { - GNodeListNode *ln; - - for (ln = gn->parents->first; ln != NULL; ln = ln->next) { - GNode *pgn = ln->datum; - - if (pgn->type & OP_ARCHV) { - /* - * If the parent is an archive specification and is being made - * and its member's name matches the name of the node we were - * given, record the modification time of the parent in the - * child. We keep searching its parents in case some other - * parent requires this child to exist... - */ - const char *nameStart = strchr(pgn->name, '(') + 1; - const char *nameEnd = strchr(nameStart, ')'); - size_t nameLen = (size_t)(nameEnd - nameStart); - - if ((pgn->flags & REMAKE) && - strncmp(nameStart, gn->name, nameLen) == 0) { - Arch_UpdateMTime(pgn); - gn->mtime = pgn->mtime; - } - } else if (pgn->flags & REMAKE) { - /* - * Something which isn't a library depends on the existence of - * this target, so it needs to exist. - */ - gn->mtime = 0; - break; + GNodeListNode *ln; + + for (ln = gn->parents.first; ln != NULL; ln = ln->next) { + GNode *pgn = ln->datum; + + if (pgn->type & OP_ARCHV) { + /* + * If the parent is an archive specification and is + * being made and its member's name matches the name + * of the node we were given, record the modification + * time of the parent in the child. We keep searching + * its parents in case some other parent requires this + * child to exist. + */ + const char *nameStart = strchr(pgn->name, '(') + 1; + const char *nameEnd = strchr(nameStart, ')'); + size_t nameLen = (size_t)(nameEnd - nameStart); + + if ((pgn->flags & REMAKE) && + strncmp(nameStart, gn->name, nameLen) == 0) { + Arch_UpdateMTime(pgn); + gn->mtime = pgn->mtime; + } + } else if (pgn->flags & REMAKE) { + /* + * Something which isn't a library depends on the + * existence of this target, so it needs to exist. + */ + gn->mtime = 0; + break; + } } - } } -/* Search for a library along the given search path. +/* + * Search for a library along the given search path. * * The node's 'path' field is set to the found path (including the * actual file name, not -l...). If the system can handle the -L * flag when linking (or we cannot find the library), we assume that * the user has placed the .LIBS variable in the final linking * command (or the linker will know where to find it) and set the * TARGET variable for this node to be the node's name. Otherwise, * we set the TARGET variable to be the full path of the library, * as returned by Dir_FindFile. * * Input: * gn Node of library to find */ void Arch_FindLib(GNode *gn, SearchPath *path) { - char *libName = str_concat3("lib", gn->name + 2, ".a"); - gn->path = Dir_FindFile(libName, path); - free(libName); + char *libName = str_concat3("lib", gn->name + 2, ".a"); + gn->path = Dir_FindFile(libName, path); + free(libName); #ifdef LIBRARIES - Var_Set(TARGET, gn->name, gn); + Var_Set(TARGET, gn->name, gn); #else - Var_Set(TARGET, gn->path == NULL ? gn->name : gn->path, gn); + Var_Set(TARGET, gn->path == NULL ? gn->name : gn->path, gn); #endif } -/* Decide if a node with the OP_LIB attribute is out-of-date. Called from +/* + * Decide if a node with the OP_LIB attribute is out-of-date. Called from * GNode_IsOODate to make its life easier. * The library is cached if it hasn't been already. * * There are several ways for a library to be out-of-date that are * not available to ordinary files. In addition, there are ways * that are open to regular files that are not available to * libraries. * * A library that is only used as a source is never * considered out-of-date by itself. This does not preclude the * library's modification time from making its parent be out-of-date. * A library will be considered out-of-date for any of these reasons, * given that it is a target on a dependency line somewhere: * * Its modification time is less than that of one of its sources * (gn->mtime < gn->youngestChild->mtime). * * Its modification time is greater than the time at which the make * began (i.e. it's been modified in the course of the make, probably * by archiving). * * The modification time of one of its sources is greater than the one * of its RANLIBMAG member (i.e. its table of contents is out-of-date). * We don't compare the archive time vs. TOC time because they can be * too close. In my opinion we should not bother with the TOC at all * since this is used by 'ar' rules that affect the data contents of the * archive, not by ranlib rules, which affect the TOC. */ Boolean Arch_LibOODate(GNode *gn) { - Boolean oodate; - - if (gn->type & OP_PHONY) { - oodate = TRUE; - } else if (!GNode_IsTarget(gn) && Lst_IsEmpty(gn->children)) { - oodate = FALSE; - } else if ((!Lst_IsEmpty(gn->children) && gn->youngestChild == NULL) || - (gn->mtime > now) || - (gn->youngestChild != NULL && - gn->mtime < gn->youngestChild->mtime)) { - oodate = TRUE; - } else { -#ifdef RANLIBMAG - struct ar_hdr *arh; /* Header for __.SYMDEF */ - int modTimeTOC; /* The table-of-contents's mod time */ - - arh = ArchStatMember(gn->path, RANLIBMAG, FALSE); - - if (arh != NULL) { - modTimeTOC = (int)strtol(arh->ar_date, NULL, 10); - - if (DEBUG(ARCH) || DEBUG(MAKE)) - debug_printf("%s modified %s...", - RANLIBMAG, Targ_FmtTime(modTimeTOC)); - oodate = gn->youngestChild == NULL || - gn->youngestChild->mtime > modTimeTOC; + Boolean oodate; + + if (gn->type & OP_PHONY) { + oodate = TRUE; + } else if (!GNode_IsTarget(gn) && Lst_IsEmpty(&gn->children)) { + oodate = FALSE; + } else if ((!Lst_IsEmpty(&gn->children) && gn->youngestChild == NULL) || + (gn->mtime > now) || + (gn->youngestChild != NULL && + gn->mtime < gn->youngestChild->mtime)) { + oodate = TRUE; } else { - /* A library without a table of contents is out-of-date. */ - if (DEBUG(ARCH) || DEBUG(MAKE)) - debug_printf("no toc..."); - oodate = TRUE; - } +#ifdef RANLIBMAG + struct ar_hdr *arh; /* Header for __.SYMDEF */ + int modTimeTOC; /* The table-of-contents' mod time */ + + arh = ArchStatMember(gn->path, RANLIBMAG, FALSE); + + if (arh != NULL) { + modTimeTOC = (int)strtol(arh->ar_date, NULL, 10); + + if (DEBUG(ARCH) || DEBUG(MAKE)) + debug_printf("%s modified %s...", + RANLIBMAG, + Targ_FmtTime(modTimeTOC)); + oodate = gn->youngestChild == NULL || + gn->youngestChild->mtime > modTimeTOC; + } else { + /* + * A library without a table of contents is out-of-date. + */ + if (DEBUG(ARCH) || DEBUG(MAKE)) + debug_printf("no toc..."); + oodate = TRUE; + } #else - oodate = FALSE; + oodate = FALSE; #endif - } - return oodate; + } + return oodate; } /* Initialize the archives module. */ void Arch_Init(void) { - archives = Lst_New(); + Lst_Init(&archives); } /* Clean up the archives module. */ void Arch_End(void) { #ifdef CLEANUP - Lst_Destroy(archives, ArchFree); + Lst_DoneCall(&archives, ArchFree); #endif } Boolean Arch_IsLib(GNode *gn) { - static const char armag[] = "!\n"; - char buf[sizeof armag - 1]; - int fd; + static const char armag[] = "!\n"; + char buf[sizeof armag - 1]; + int fd; - if ((fd = open(gn->path, O_RDONLY)) == -1) - return FALSE; + if ((fd = open(gn->path, O_RDONLY)) == -1) + return FALSE; - if (read(fd, buf, sizeof buf) != sizeof buf) { - (void)close(fd); - return FALSE; - } + if (read(fd, buf, sizeof buf) != sizeof buf) { + (void)close(fd); + return FALSE; + } - (void)close(fd); + (void)close(fd); - return memcmp(buf, armag, sizeof buf) == 0; + return memcmp(buf, armag, sizeof buf) == 0; } diff --git a/bmake.1 b/bmake.1 index cbd1ae9f8677..f35c14cc1eee 100644 --- a/bmake.1 +++ b/bmake.1 @@ -1,2468 +1,2474 @@ -.\" $NetBSD: make.1,v 1.292 2020/11/14 22:19:13 rillig Exp $ +.\" $NetBSD: make.1,v 1.295 2020/12/23 13:49:12 rillig Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd November 14, 2020 +.Dd December 22, 2020 .Dt BMAKE 1 .Os .Sh NAME .Nm bmake .Nd maintain program dependencies .Sh SYNOPSIS .Nm .Op Fl BeikNnqrSstWwX .Op Fl C Ar directory .Op Fl D Ar variable .Op Fl d Ar flags .Op Fl f Ar makefile .Op Fl I Ar directory .Op Fl J Ar private .Op Fl j Ar max_jobs .Op Fl m Ar directory .Op Fl T Ar file .Op Fl V Ar variable .Op Fl v Ar variable .Op Ar variable=value .Op Ar target ... .Sh DESCRIPTION .Nm is a program designed to simplify the maintenance of other programs. Its input is a list of specifications as to the files upon which programs and other files depend. If no .Fl f Ar makefile makefile option is given, .Nm will try to open .Ql Pa makefile then .Ql Pa Makefile in order to find the specifications. If the file .Ql Pa .depend exists, it is read (see .Xr mkdep 1 ) . .Pp This manual page is intended as a reference document only. For a more thorough description of .Nm and makefiles, please refer to .%T "PMake \- A Tutorial" . .Pp .Nm will prepend the contents of the .Va MAKEFLAGS environment variable to the command line arguments before parsing them. .Pp The options are as follows: .Bl -tag -width Ds .It Fl B Try to be backwards compatible by executing a single shell per command and by executing the commands to make the sources of a dependency line in sequence. .It Fl C Ar directory Change to .Ar directory before reading the makefiles or doing anything else. If multiple .Fl C options are specified, each is interpreted relative to the previous one: .Fl C Pa / Fl C Pa etc is equivalent to .Fl C Pa /etc . .It Fl D Ar variable Define .Ar variable to be 1, in the global context. .It Fl d Ar [-]flags Turn on debugging, and specify which portions of .Nm are to print debugging information. Unless the flags are preceded by .Ql \- they are added to the .Va MAKEFLAGS environment variable and will be processed by any child make processes. By default, debugging information is printed to standard error, but this can be changed using the .Ar F debugging flag. The debugging output is always unbuffered; in addition, if debugging is enabled but debugging output is not directed to standard output, then the standard output is line buffered. .Ar Flags is one or more of the following: .Bl -tag -width Ds .It Ar A Print all possible debugging information; equivalent to specifying all of the debugging flags. .It Ar a Print debugging information about archive searching and caching. .It Ar C Print debugging information about current working directory. .It Ar c Print debugging information about conditional evaluation. .It Ar d Print debugging information about directory searching and caching. .It Ar e Print debugging information about failed commands and targets. .It Ar F Ns Oo Sy \&+ Oc Ns Ar filename Specify where debugging output is written. This must be the last flag, because it consumes the remainder of the argument. If the character immediately after the .Ql F flag is .Ql \&+ , then the file will be opened in append mode; otherwise the file will be overwritten. If the file name is .Ql stdout or .Ql stderr then debugging output will be written to the standard output or standard error output file descriptors respectively (and the .Ql \&+ option has no effect). Otherwise, the output will be written to the named file. If the file name ends .Ql .%d then the .Ql %d is replaced by the pid. .It Ar f Print debugging information about loop evaluation. .It Ar "g1" Print the input graph before making anything. .It Ar "g2" Print the input graph after making everything, or before exiting on error. .It Ar "g3" Print the input graph before exiting on error. .It Ar h Print debugging information about hash table operations. .It Ar j Print debugging information about running multiple shells. .It Ar L Turn on lint checks. This will throw errors for variable assignments that do not parse correctly, at the time of assignment so the file and line number are available. .It Ar l Print commands in Makefiles regardless of whether or not they are prefixed by .Ql @ or other "quiet" flags. Also known as "loud" behavior. .It Ar M Print debugging information about "meta" mode decisions about targets. .It Ar m Print debugging information about making targets, including modification dates. .It Ar n Don't delete the temporary command scripts created when running commands. These temporary scripts are created in the directory referred to by the .Ev TMPDIR environment variable, or in .Pa /tmp if .Ev TMPDIR is unset or set to the empty string. The temporary scripts are created by .Xr mkstemp 3 , and have names of the form .Pa makeXXXXXX . .Em NOTE : This can create many files in .Ev TMPDIR or .Pa /tmp , so use with care. .It Ar p Print debugging information about makefile parsing. .It Ar s Print debugging information about suffix-transformation rules. .It Ar t Print debugging information about target list maintenance. .It Ar V Force the .Fl V option to print raw values of variables, overriding the default behavior set via .Va .MAKE.EXPAND_VARIABLES . .It Ar v Print debugging information about variable assignment. .It Ar x Run shell commands with .Fl x so the actual commands are printed as they are executed. .El .It Fl e Specify that environment variables override macro assignments within makefiles. .It Fl f Ar makefile Specify a makefile to read instead of the default .Ql Pa makefile . If .Ar makefile is .Ql Fl , standard input is read. Multiple makefiles may be specified, and are read in the order specified. .It Fl I Ar directory Specify a directory in which to search for makefiles and included makefiles. The system makefile directory (or directories, see the .Fl m option) is automatically included as part of this list. .It Fl i Ignore non-zero exit of shell commands in the makefile. Equivalent to specifying .Ql Fl before each command line in the makefile. .It Fl J Ar private This option should .Em not be specified by the user. .Pp When the .Ar j option is in use in a recursive build, this option is passed by a make to child makes to allow all the make processes in the build to cooperate to avoid overloading the system. .It Fl j Ar max_jobs Specify the maximum number of jobs that .Nm may have running at any one time. The value is saved in .Va .MAKE.JOBS . Turns compatibility mode off, unless the .Ar B flag is also specified. When compatibility mode is off, all commands associated with a target are executed in a single shell invocation as opposed to the traditional one shell invocation per line. This can break traditional scripts which change directories on each command invocation and then expect to start with a fresh environment on the next line. It is more efficient to correct the scripts rather than turn backwards compatibility on. .It Fl k Continue processing after errors are encountered, but only on those targets that do not depend on the target whose creation caused the error. .It Fl m Ar directory Specify a directory in which to search for sys.mk and makefiles included via the .Li \&< Ns Ar file Ns Li \&> Ns -style include statement. The .Fl m option can be used multiple times to form a search path. This path will override the default system include path: /usr/share/mk. Furthermore the system include path will be appended to the search path used for .Li \*q Ns Ar file Ns Li \*q Ns -style include statements (see the .Fl I option). .Pp If a file or directory name in the .Fl m argument (or the .Ev MAKESYSPATH environment variable) starts with the string .Qq \&.../ then .Nm will search for the specified file or directory named in the remaining part of the argument string. The search starts with the current directory of the Makefile and then works upward towards the root of the file system. If the search is successful, then the resulting directory replaces the .Qq \&.../ specification in the .Fl m argument. If used, this feature allows .Nm to easily search in the current source tree for customized sys.mk files (e.g., by using .Qq \&.../mk/sys.mk as an argument). .It Fl n Display the commands that would have been executed, but do not actually execute them unless the target depends on the .MAKE special source (see below) or the command is prefixed with .Ql Ic + . .It Fl N Display the commands which would have been executed, but do not actually execute any of them; useful for debugging top-level makefiles without descending into subdirectories. .It Fl q Do not execute any commands, but exit 0 if the specified targets are up-to-date and 1, otherwise. .It Fl r Do not use the built-in rules specified in the system makefile. .It Fl S Stop processing if an error is encountered. This is the default behavior and the opposite of .Fl k . .It Fl s Do not echo any commands as they are executed. Equivalent to specifying .Ql Ic @ before each command line in the makefile. .It Fl T Ar tracefile When used with the .Fl j flag, append a trace record to .Ar tracefile for each job started and completed. .It Fl t Rather than re-building a target as specified in the makefile, create it or update its modification time to make it appear up-to-date. .It Fl V Ar variable Print the value of .Ar variable . Do not build any targets. Multiple instances of this option may be specified; the variables will be printed one per line, with a blank line for each null or undefined variable. The value printed is extracted from the global context after all makefiles have been read. By default, the raw variable contents (which may include additional unexpanded variable references) are shown. If .Ar variable contains a .Ql \&$ then the value will be recursively expanded to its complete resultant text before printing. The expanded value will also be printed if .Va .MAKE.EXPAND_VARIABLES is set to true and the .Fl dV option has not been used to override it. Note that loop-local and target-local variables, as well as values taken temporarily by global variables during makefile processing, are not accessible via this option. The .Fl dv debug mode can be used to see these at the cost of generating substantial extraneous output. .It Fl v Ar variable Like .Fl V but the variable is always expanded to its complete value. .It Fl W Treat any warnings during makefile parsing as errors. .It Fl w Print entering and leaving directory messages, pre and post processing. .It Fl X Don't export variables passed on the command line to the environment individually. Variables passed on the command line are still exported via the .Va MAKEFLAGS environment variable. This option may be useful on systems which have a small limit on the size of command arguments. .It Ar variable=value Set the value of the variable .Ar variable to .Ar value . Normally, all values passed on the command line are also exported to sub-makes in the environment. The .Fl X flag disables this behavior. Variable assignments should follow options for POSIX compatibility but no ordering is enforced. .El .Pp There are seven different types of lines in a makefile: file dependency specifications, shell commands, variable assignments, include statements, conditional directives, for loops, and comments. .Pp In general, lines may be continued from one line to the next by ending them with a backslash .Pq Ql \e . The trailing newline character and initial whitespace on the following line are compressed into a single space. .Sh FILE DEPENDENCY SPECIFICATIONS Dependency lines consist of one or more targets, an operator, and zero or more sources. This creates a relationship where the targets .Dq depend on the sources and are customarily created from them. A target is considered out-of-date if it does not exist, or if its modification time is less than that of any of its sources. An out-of-date target will be re-created, but not until all sources have been examined and themselves re-created as needed. Three operators may be used: .Bl -tag -width flag .It Ic \&: Many dependency lines may name this target but only one may have attached shell commands. All sources named in all dependency lines are considered together, and if needed the attached shell commands are run to create or re-create the target. If .Nm is interrupted, the target is removed. .It Ic \&! The same, but the target is always re-created whether or not it is out of date. .It Ic \&:: Any dependency line may have attached shell commands, but each one is handled independently: its sources are considered and the attached shell commands are run if the target is out of date with respect to (only) those sources. Thus, different groups of the attached shell commands may be run depending on the circumstances. Furthermore, unlike .Ic \&:, for dependency lines with no sources, the attached shell commands are always run. Also unlike .Ic \&:, the target will not be removed if .Nm is interrupted. .El All dependency lines mentioning a particular target must use the same operator. .Pp Targets and sources may contain the shell wildcard values .Ql \&? , .Ql * , .Ql [] , and .Ql {} . The values .Ql \&? , .Ql * , and .Ql [] may only be used as part of the final component of the target or source, and must be used to describe existing files. The value .Ql {} need not necessarily be used to describe existing files. Expansion is in directory order, not alphabetically as done in the shell. .Sh SHELL COMMANDS Each target may have associated with it one or more lines of shell commands, normally used to create the target. Each of the lines in this script .Em must be preceded by a tab. (For historical reasons, spaces are not accepted.) While targets can appear in many dependency lines if desired, by default only one of these rules may be followed by a creation script. If the .Ql Ic \&:: operator is used, however, all rules may include scripts and the scripts are executed in the order found. .Pp Each line is treated as a separate shell command, unless the end of line is escaped with a backslash .Pq Ql \e in which case that line and the next are combined. .\" The escaped newline is retained and passed to the shell, which .\" normally ignores it. .\" However, the tab at the beginning of the following line is removed. If the first characters of the command are any combination of .Ql Ic @ , .Ql Ic + , or .Ql Ic \- , the command is treated specially. A .Ql Ic @ causes the command not to be echoed before it is executed. A .Ql Ic + causes the command to be executed even when .Fl n is given. This is similar to the effect of the .MAKE special source, except that the effect can be limited to a single line of a script. A .Ql Ic \- in compatibility mode causes any non-zero exit status of the command line to be ignored. .Pp When .Nm is run in jobs mode with .Fl j Ar max_jobs , the entire script for the target is fed to a single instance of the shell. In compatibility (non-jobs) mode, each command is run in a separate process. If the command contains any shell meta characters .Pq Ql #=|^(){};&<>*?[]:$`\e\en it will be passed to the shell; otherwise .Nm will attempt direct execution. If a line starts with .Ql Ic \- and the shell has ErrCtl enabled then failure of the command line will be ignored as in compatibility mode. Otherwise .Ql Ic \- affects the entire job; the script will stop at the first command line that fails, but the target will not be deemed to have failed. .Pp Makefiles should be written so that the mode of .Nm operation does not change their behavior. For example, any command which needs to use .Dq cd or .Dq chdir without potentially changing the directory for subsequent commands should be put in parentheses so it executes in a subshell. To force the use of one shell, escape the line breaks so as to make the whole script one command. For example: .Bd -literal -offset indent avoid-chdir-side-effects: @echo Building $@ in `pwd` @(cd ${.CURDIR} && ${MAKE} $@) @echo Back in `pwd` ensure-one-shell-regardless-of-mode: @echo Building $@ in `pwd`; \e (cd ${.CURDIR} && ${MAKE} $@); \e echo Back in `pwd` .Ed .Pp Since .Nm will .Xr chdir 2 to .Ql Va .OBJDIR before executing any targets, each child process starts with that as its current working directory. .Sh VARIABLE ASSIGNMENTS Variables in make are much like variables in the shell, and, by tradition, consist of all upper-case letters. .Ss Variable assignment modifiers The five operators that can be used to assign values to variables are as follows: .Bl -tag -width Ds .It Ic \&= Assign the value to the variable. Any previous value is overridden. .It Ic \&+= Append the value to the current value of the variable. .It Ic \&?= Assign the value to the variable if it is not already defined. .It Ic \&:= Assign with expansion, i.e. expand the value before assigning it to the variable. Normally, expansion is not done until the variable is referenced. .Em NOTE : References to undefined variables are .Em not expanded. This can cause problems when variable modifiers are used. .It Ic \&!= Expand the value and pass it to the shell for execution and assign the result to the variable. Any newlines in the result are replaced with spaces. .El .Pp Any white-space before the assigned .Ar value is removed; if the value is being appended, a single space is inserted between the previous contents of the variable and the appended value. .Pp Variables are expanded by surrounding the variable name with either curly braces .Pq Ql {} or parentheses .Pq Ql () and preceding it with a dollar sign .Pq Ql \&$ . If the variable name contains only a single letter, the surrounding braces or parentheses are not required. This shorter form is not recommended. .Pp If the variable name contains a dollar, then the name itself is expanded first. This allows almost arbitrary variable names, however names containing dollar, braces, parentheses, or whitespace are really best avoided! .Pp If the result of expanding a variable contains a dollar sign .Pq Ql \&$ the string is expanded again. .Pp Variable substitution occurs at three distinct times, depending on where the variable is being used. .Bl -enum .It Variables in dependency lines are expanded as the line is read. .It Variables in shell commands are expanded when the shell command is executed. .It .Dq .for loop index variables are expanded on each loop iteration. Note that other variables are not expanded inside loops so the following example code: .Bd -literal -offset indent .Dv .for i in 1 2 3 a+= ${i} j= ${i} b+= ${j} .Dv .endfor all: @echo ${a} @echo ${b} .Ed will print: .Bd -literal -offset indent 1 2 3 3 3 3 .Ed Because while ${a} contains .Dq 1 2 3 after the loop is executed, ${b} contains .Dq ${j} ${j} ${j} which expands to .Dq 3 3 3 since after the loop completes ${j} contains .Dq 3 . .El .Ss Variable classes The four different classes of variables (in order of increasing precedence) are: .Bl -tag -width Ds .It Environment variables Variables defined as part of .Nm Ns 's environment. .It Global variables Variables defined in the makefile or in included makefiles. .It Command line variables Variables defined as part of the command line. .It Local variables Variables that are defined specific to a certain target. .El .Pp Local variables are all built in and their values vary magically from target to target. It is not currently possible to define new local variables. The seven local variables are as follows: .Bl -tag -width ".ARCHIVE" -offset indent .It Va .ALLSRC The list of all sources for this target; also known as .Ql Va \&> . .It Va .ARCHIVE The name of the archive file; also known as .Ql Va \&! . .It Va .IMPSRC In suffix-transformation rules, the name/path of the source from which the target is to be transformed (the .Dq implied source); also known as .Ql Va \&< . It is not defined in explicit rules. .It Va .MEMBER The name of the archive member; also known as .Ql Va % . .It Va .OODATE The list of sources for this target that were deemed out-of-date; also known as .Ql Va \&? . .It Va .PREFIX The file prefix of the target, containing only the file portion, no suffix or preceding directory components; also known as .Ql Va * . The suffix must be one of the known suffixes declared with .Ic .SUFFIXES or it will not be recognized. .It Va .TARGET The name of the target; also known as .Ql Va @ . For compatibility with other makes this is an alias for .Ic .ARCHIVE in archive member rules. .El .Pp The shorter forms .Ql ( Va > , .Ql Va \&! , .Ql Va < , .Ql Va % , .Ql Va \&? , .Ql Va * , and .Ql Va @ ) are permitted for backward compatibility with historical makefiles and legacy POSIX make and are not recommended. .Pp Variants of these variables with the punctuation followed immediately by .Ql D or .Ql F , e.g. .Ql Va $(@D) , are legacy forms equivalent to using the .Ql :H and .Ql :T modifiers. These forms are accepted for compatibility with .At V makefiles and POSIX but are not recommended. .Pp Four of the local variables may be used in sources on dependency lines because they expand to the proper value for each target on the line. These variables are .Ql Va .TARGET , .Ql Va .PREFIX , .Ql Va .ARCHIVE , and .Ql Va .MEMBER . .Ss Additional built-in variables In addition, .Nm sets or knows about the following variables: .Bl -tag -width .MAKEOVERRIDES .It Va \&$ A single dollar sign .Ql \&$ , i.e. .Ql \&$$ expands to a single dollar sign. .It Va .ALLTARGETS The list of all targets encountered in the Makefile. If evaluated during Makefile parsing, lists only those targets encountered thus far. .It Va .CURDIR A path to the directory where .Nm was executed. Refer to the description of .Ql Ev PWD for more details. .It Va .INCLUDEDFROMDIR The directory of the file this Makefile was included from. .It Va .INCLUDEDFROMFILE The filename of the file this Makefile was included from. .It Ev MAKE The name that .Nm was executed with .Pq Va argv[0] . For compatibility .Nm also sets .Va .MAKE with the same value. The preferred variable to use is the environment variable .Ev MAKE because it is more compatible with other versions of .Nm and cannot be confused with the special target with the same name. .It Va .MAKE.DEPENDFILE Names the makefile (default .Ql Pa .depend ) from which generated dependencies are read. .It Va .MAKE.EXPAND_VARIABLES A boolean that controls the default behavior of the .Fl V option. If true, variable values printed with .Fl V are fully expanded; if false, the raw variable contents (which may include additional unexpanded variable references) are shown. .It Va .MAKE.EXPORTED The list of variables exported by .Nm . .It Va .MAKE.JOBS The argument to the .Fl j option. .It Va .MAKE.JOB.PREFIX If .Nm is run with .Ar j then output for each target is prefixed with a token .Ql --- target --- the first part of which can be controlled via .Va .MAKE.JOB.PREFIX . If .Va .MAKE.JOB.PREFIX is empty, no token is printed. .br For example: .Li .MAKE.JOB.PREFIX=${.newline}---${.MAKE:T}[${.MAKE.PID}] would produce tokens like .Ql ---make[1234] target --- making it easier to track the degree of parallelism being achieved. .It Ev MAKEFLAGS The environment variable .Ql Ev MAKEFLAGS may contain anything that may be specified on .Nm Ns 's command line. Anything specified on .Nm Ns 's command line is appended to the .Ql Ev MAKEFLAGS variable which is then entered into the environment for all programs which .Nm executes. .It Va .MAKE.LEVEL The recursion depth of .Nm . The initial instance of .Nm will be 0, and an incremented value is put into the environment to be seen by the next generation. This allows tests like: .Li .if ${.MAKE.LEVEL} == 0 to protect things which should only be evaluated in the initial instance of .Nm . .It Va .MAKE.MAKEFILE_PREFERENCE The ordered list of makefile names (default .Ql Pa makefile , .Ql Pa Makefile ) that .Nm will look for. .It Va .MAKE.MAKEFILES The list of makefiles read by .Nm , which is useful for tracking dependencies. Each makefile is recorded only once, regardless of the number of times read. .It Va .MAKE.MODE Processed after reading all makefiles. Can affect the mode that .Nm runs in. It can contain a number of keywords: .Bl -hang -width missing-filemon=bf. .It Pa compat Like .Fl B , puts .Nm into "compat" mode. .It Pa meta Puts .Nm into "meta" mode, where meta files are created for each target to capture the command run, the output generated and if .Xr filemon 4 is available, the system calls which are of interest to .Nm . The captured output can be very useful when diagnosing errors. .It Pa curdirOk= Ar bf Normally .Nm will not create .meta files in .Ql Va .CURDIR . This can be overridden by setting .Va bf to a value which represents True. .It Pa missing-meta= Ar bf If .Va bf is True, then a missing .meta file makes the target out-of-date. .It Pa missing-filemon= Ar bf If .Va bf is True, then missing filemon data makes the target out-of-date. .It Pa nofilemon Do not use .Xr filemon 4 . .It Pa env For debugging, it can be useful to include the environment in the .meta file. .It Pa verbose If in "meta" mode, print a clue about the target being built. This is useful if the build is otherwise running silently. The message printed the value of: .Va .MAKE.META.PREFIX . .It Pa ignore-cmd Some makefiles have commands which are simply not stable. This keyword causes them to be ignored for determining whether a target is out of date in "meta" mode. See also .Ic .NOMETA_CMP . .It Pa silent= Ar bf If .Va bf is True, when a .meta file is created, mark the target .Ic .SILENT . .El .It Va .MAKE.META.BAILIWICK In "meta" mode, provides a list of prefixes which match the directories controlled by .Nm . If a file that was generated outside of .Va .OBJDIR but within said bailiwick is missing, the current target is considered out-of-date. .It Va .MAKE.META.CREATED In "meta" mode, this variable contains a list of all the meta files updated. If not empty, it can be used to trigger processing of .Va .MAKE.META.FILES . .It Va .MAKE.META.FILES In "meta" mode, this variable contains a list of all the meta files used (updated or not). This list can be used to process the meta files to extract dependency information. .It Va .MAKE.META.IGNORE_PATHS Provides a list of path prefixes that should be ignored; because the contents are expected to change over time. The default list includes: .Ql Pa /dev /etc /proc /tmp /var/run /var/tmp .It Va .MAKE.META.IGNORE_PATTERNS Provides a list of patterns to match against pathnames. Ignore any that match. .It Va .MAKE.META.IGNORE_FILTER Provides a list of variable modifiers to apply to each pathname. Ignore if the expansion is an empty string. .It Va .MAKE.META.PREFIX Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: .Dl Building ${.TARGET:H:tA}/${.TARGET:T} .It Va .MAKEOVERRIDES This variable is used to record the names of variables assigned to on the command line, so that they may be exported as part of .Ql Ev MAKEFLAGS . This behavior can be disabled by assigning an empty value to .Ql Va .MAKEOVERRIDES within a makefile. Extra variables can be exported from a makefile by appending their names to .Ql Va .MAKEOVERRIDES . .Ql Ev MAKEFLAGS is re-exported whenever .Ql Va .MAKEOVERRIDES is modified. .It Va .MAKE.PATH_FILEMON If .Nm was built with .Xr filemon 4 support, this is set to the path of the device node. This allows makefiles to test for this support. .It Va .MAKE.PID The process-id of .Nm . .It Va .MAKE.PPID The parent process-id of .Nm . .It Va .MAKE.SAVE_DOLLARS value should be a boolean that controls whether .Ql $$ are preserved when doing .Ql := assignments. The default is false, for backwards compatibility. Set to true for compatability with other makes. If set to false, .Ql $$ becomes .Ql $ per normal evaluation rules. +.It Va .MAKE.UID +The user-id running +.Nm . +.It Va .MAKE.GID +The group-id running +.Nm . .It Va MAKE_PRINT_VAR_ON_ERROR When .Nm stops due to an error, it sets .Ql Va .ERROR_TARGET to the name of the target that failed, .Ql Va .ERROR_CMD to the commands of the failed target, and in "meta" mode, it also sets .Ql Va .ERROR_CWD to the .Xr getcwd 3 , and .Ql Va .ERROR_META_FILE to the path of the meta file (if any) describing the failed target. It then prints its name and the value of .Ql Va .CURDIR as well as the value of any variables named in .Ql Va MAKE_PRINT_VAR_ON_ERROR . .It Va .newline This variable is simply assigned a newline character as its value. This allows expansions using the .Cm \&:@ modifier to put a newline between iterations of the loop rather than a space. For example, the printing of .Ql Va MAKE_PRINT_VAR_ON_ERROR could be done as ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@}. .It Va .OBJDIR A path to the directory where the targets are built. Its value is determined by trying to .Xr chdir 2 to the following directories in order and using the first match: .Bl -enum .It .Ev ${MAKEOBJDIRPREFIX}${.CURDIR} .Pp (Only if .Ql Ev MAKEOBJDIRPREFIX is set in the environment or on the command line.) .It .Ev ${MAKEOBJDIR} .Pp (Only if .Ql Ev MAKEOBJDIR is set in the environment or on the command line.) .It .Ev ${.CURDIR} Ns Pa /obj. Ns Ev ${MACHINE} .It .Ev ${.CURDIR} Ns Pa /obj .It .Pa /usr/obj/ Ns Ev ${.CURDIR} .It .Ev ${.CURDIR} .El .Pp Variable expansion is performed on the value before it's used, so expressions such as .Dl ${.CURDIR:S,^/usr/src,/var/obj,} may be used. This is especially useful with .Ql Ev MAKEOBJDIR . .Pp .Ql Va .OBJDIR may be modified in the makefile via the special target .Ql Ic .OBJDIR . In all cases, .Nm will .Xr chdir 2 to the specified directory if it exists, and set .Ql Va .OBJDIR and .Ql Ev PWD to that directory before executing any targets. .Pp Except in the case of an explicit .Ql Ic .OBJDIR -target, +target, .Nm will check that the specified directory is writable and ignore it if not. This check can be skipped by setting the environment variable .Ql Ev MAKE_OBJDIR_CHECK_WRITABLE to "no". . .It Va .PARSEDIR A path to the directory of the current .Ql Pa Makefile being parsed. .It Va .PARSEFILE The basename of the current .Ql Pa Makefile being parsed. This variable and .Ql Va .PARSEDIR are both set only while the .Ql Pa Makefiles are being parsed. If you want to retain their current values, assign them to a variable using assignment with expansion: .Pq Ql Cm \&:= . .It Va .PATH A variable that represents the list of directories that .Nm will search for files. The search list should be updated using the target .Ql Va .PATH rather than the variable. .It Ev PWD Alternate path to the current directory. .Nm normally sets .Ql Va .CURDIR to the canonical path given by .Xr getcwd 3 . However, if the environment variable .Ql Ev PWD is set and gives a path to the current directory, then .Nm sets .Ql Va .CURDIR to the value of .Ql Ev PWD instead. This behavior is disabled if .Ql Ev MAKEOBJDIRPREFIX is set or .Ql Ev MAKEOBJDIR contains a variable transform. .Ql Ev PWD is set to the value of .Ql Va .OBJDIR for all programs which .Nm executes. .It Ev .SHELL The pathname of the shell used to run target scripts. It is read-only. .It Ev .TARGETS The list of targets explicitly specified on the command line, if any. .It Ev VPATH Colon-separated .Pq Dq \&: lists of directories that .Nm will search for files. The variable is supported for compatibility with old make programs only, use .Ql Va .PATH instead. .El .Ss Variable modifiers Variable expansion may be modified to select or modify each word of the variable (where a .Dq word is white-space delimited sequence of characters). The general format of a variable expansion is as follows: .Pp .Dl ${variable[:modifier[:...]]} .Pp Each modifier begins with a colon, which may be escaped with a backslash .Pq Ql \e . .Pp A set of modifiers can be specified via a variable, as follows: .Pp .Dl modifier_variable=modifier[:...] .Dl ${variable:${modifier_variable}[:...]} .Pp In this case the first modifier in the modifier_variable does not start with a colon, since that must appear in the referencing variable. If any of the modifiers in the modifier_variable contain a dollar sign .Pq Ql $ , these must be doubled to avoid early expansion. .Pp The supported modifiers are: .Bl -tag -width EEE .It Cm \&:E Replaces each word in the variable with its suffix. .It Cm \&:H Replaces each word in the variable with everything but the last component. .It Cm \&:M Ns Ar pattern Selects only those words that match .Ar pattern . The standard shell wildcard characters .Pf ( Ql * , .Ql \&? , and .Ql Oo Oc ) may be used. The wildcard characters may be escaped with a backslash .Pq Ql \e . As a consequence of the way values are split into words, matched, and then joined, a construct like .Dl ${VAR:M*} will normalize the inter-word spacing, removing all leading and trailing space, and converting multiple consecutive spaces to single spaces. . .It Cm \&:N Ns Ar pattern This is identical to .Ql Cm \&:M , but selects all words which do not match .Ar pattern . .It Cm \&:O Orders every word in variable alphabetically. .It Cm \&:Or Orders every word in variable in reverse alphabetical order. .It Cm \&:Ox Shuffles the words in variable. The results will be different each time you are referring to the modified variable; use the assignment with expansion .Pq Ql Cm \&:= to prevent such behavior. For example, .Bd -literal -offset indent LIST= uno due tre quattro RANDOM_LIST= ${LIST:Ox} STATIC_RANDOM_LIST:= ${LIST:Ox} all: @echo "${RANDOM_LIST}" @echo "${RANDOM_LIST}" @echo "${STATIC_RANDOM_LIST}" @echo "${STATIC_RANDOM_LIST}" .Ed may produce output similar to: .Bd -literal -offset indent quattro due tre uno tre due quattro uno due uno quattro tre due uno quattro tre .Ed .It Cm \&:Q Quotes every shell meta-character in the variable, so that it can be passed safely to the shell. .It Cm \&:q Quotes every shell meta-character in the variable, and also doubles .Sq $ characters so that it can be passed safely through recursive invocations of .Nm . This is equivalent to: .Sq \&:S/\e\&$/&&/g:Q . .It Cm \&:R Replaces each word in the variable with everything but its suffix. .It Cm \&:range[=count] The value is an integer sequence representing the words of the original value, or the supplied .Va count . .It Cm \&:gmtime[=utc] The value is a format string for .Xr strftime 3 , using .Xr gmtime 3 . If a .Va utc value is not provided or is 0, the current time is used. .It Cm \&:hash Computes a 32-bit hash of the value and encode it as hex digits. .It Cm \&:localtime[=utc] The value is a format string for .Xr strftime 3 , using .Xr localtime 3 . If a .Va utc value is not provided or is 0, the current time is used. .It Cm \&:tA Attempts to convert variable to an absolute path using .Xr realpath 3 , if that fails, the value is unchanged. .It Cm \&:tl Converts variable to lower-case letters. .It Cm \&:ts Ns Ar c Words in the variable are normally separated by a space on expansion. This modifier sets the separator to the character .Ar c . If .Ar c is omitted, then no separator is used. The common escapes (including octal numeric codes) work as expected. .It Cm \&:tu Converts variable to upper-case letters. .It Cm \&:tW Causes the value to be treated as a single word (possibly containing embedded white space). See also .Ql Cm \&:[*] . .It Cm \&:tw Causes the value to be treated as a sequence of words delimited by white space. See also .Ql Cm \&:[@] . .Sm off .It Cm \&:S No \&/ Ar old_string No \&/ Ar new_string No \&/ Op Cm 1gW .Sm on Modifies the first occurrence of .Ar old_string in each word of the variable's value, replacing it with .Ar new_string . If a .Ql g is appended to the last delimiter of the pattern, all occurrences in each word are replaced. If a .Ql 1 is appended to the last delimiter of the pattern, only the first occurrence is affected. If a .Ql W is appended to the last delimiter of the pattern, then the value is treated as a single word (possibly containing embedded white space). If .Ar old_string begins with a caret .Pq Ql ^ , .Ar old_string is anchored at the beginning of each word. If .Ar old_string ends with a dollar sign .Pq Ql \&$ , it is anchored at the end of each word. Inside .Ar new_string , an ampersand .Pq Ql & is replaced by .Ar old_string (without any .Ql ^ or .Ql \&$ ) . Any character may be used as a delimiter for the parts of the modifier string. The anchoring, ampersand and delimiter characters may be escaped with a backslash .Pq Ql \e . .Pp Variable expansion occurs in the normal fashion inside both .Ar old_string and .Ar new_string with the single exception that a backslash is used to prevent the expansion of a dollar sign .Pq Ql \&$ , not a preceding dollar sign as is usual. .Sm off .It Cm \&:C No \&/ Ar pattern No \&/ Ar replacement No \&/ Op Cm 1gW .Sm on The .Cm \&:C modifier is just like the .Cm \&:S modifier except that the old and new strings, instead of being simple strings, are an extended regular expression (see .Xr regex 3 ) string .Ar pattern and an .Xr ed 1 Ns \-style string .Ar replacement . Normally, the first occurrence of the pattern .Ar pattern in each word of the value is substituted with .Ar replacement . The .Ql 1 modifier causes the substitution to apply to at most one word; the .Ql g modifier causes the substitution to apply to as many instances of the search pattern .Ar pattern as occur in the word or words it is found in; the .Ql W modifier causes the value to be treated as a single word (possibly containing embedded white space). .Pp As for the .Cm \&:S modifier, the .Ar pattern and .Ar replacement are subjected to variable expansion before being parsed as regular expressions. .It Cm \&:T Replaces each word in the variable with its last path component. .It Cm \&:u Removes adjacent duplicate words (like .Xr uniq 1 ) . .Sm off .It Cm \&:\&? Ar true_string Cm \&: Ar false_string .Sm on If the variable name (not its value), when parsed as a .if conditional expression, evaluates to true, return as its value the .Ar true_string , otherwise return the .Ar false_string . Since the variable name is used as the expression, \&:\&? must be the first modifier after the variable name itself - which will, of course, usually contain variable expansions. A common error is trying to use expressions like .Dl ${NUMBERS:M42:?match:no} which actually tests defined(NUMBERS), to determine if any words match "42" you need to use something like: .Dl ${"${NUMBERS:M42}" != \&"\&":?match:no} . .It Ar :old_string=new_string This is the .At V style variable substitution. It must be the last modifier specified. If .Ar old_string or .Ar new_string do not contain the pattern matching character .Ar % then it is assumed that they are anchored at the end of each word, so only suffixes or entire words may be replaced. Otherwise .Ar % is the substring of .Ar old_string to be replaced in .Ar new_string . If only .Ar old_string contains the pattern matching character .Ar % , and .Ar old_string matches, then the result is the .Ar new_string . If only the .Ar new_string contains the pattern matching character .Ar % , then it is not treated specially and it is printed as a literal .Ar % on match. If there is more than one pattern matching character .Ar ( % ) in either the .Ar new_string or .Ar old_string , only the first instance is treated specially (as the pattern character); all subsequent instances are treated as regular characters. .Pp Variable expansion occurs in the normal fashion inside both .Ar old_string and .Ar new_string with the single exception that a backslash is used to prevent the expansion of a dollar sign .Pq Ql \&$ , not a preceding dollar sign as is usual. .Sm off .It Cm \&:@ Ar temp Cm @ Ar string Cm @ .Sm on This is the loop expansion mechanism from the OSF Development Environment (ODE) make. Unlike .Cm \&.for loops, expansion occurs at the time of reference. Assigns .Ar temp to each word in the variable and evaluates .Ar string . The ODE convention is that .Ar temp should start and end with a period. For example. .Dl ${LINKS:@.LINK.@${LN} ${TARGET} ${.LINK.}@} .Pp However a single character variable is often more readable: .Dl ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@} .It Cm \&:_[=var] Saves the current variable value in .Ql $_ or the named .Va var for later reference. Example usage: .Bd -literal -offset indent M_cmpv.units = 1 1000 1000000 M_cmpv = S,., ,g:_:range:@i@+ $${_:[-$$i]} \&\\ \\* $${M_cmpv.units:[$$i]}@:S,^,expr 0 ,1:sh .Dv .if ${VERSION:${M_cmpv}} < ${3.1.12:L:${M_cmpv}} .Ed Here .Ql $_ is used to save the result of the .Ql :S modifier which is later referenced using the index values from .Ql :range . .It Cm \&:U Ns Ar newval If the variable is undefined, .Ar newval is the value. If the variable is defined, the existing value is returned. This is another ODE make feature. It is handy for setting per-target CFLAGS for instance: .Dl ${_${.TARGET:T}_CFLAGS:U${DEF_CFLAGS}} If a value is only required if the variable is undefined, use: .Dl ${VAR:D:Unewval} .It Cm \&:D Ns Ar newval If the variable is defined, .Ar newval is the value. .It Cm \&:L The name of the variable is the value. .It Cm \&:P The path of the node which has the same name as the variable is the value. If no such node exists or its path is null, then the name of the variable is used. In order for this modifier to work, the name (node) must at least have appeared on the rhs of a dependency. .Sm off .It Cm \&:\&! Ar cmd Cm \&! .Sm on The output of running .Ar cmd is the value. .It Cm \&:sh If the variable is non-empty it is run as a command and the output becomes the new value. .It Cm \&::= Ns Ar str The variable is assigned the value .Ar str after substitution. This modifier and its variations are useful in obscure situations such as wanting to set a variable when shell commands are being parsed. These assignment modifiers always expand to nothing, so if appearing in a rule line by themselves should be preceded with something to keep .Nm happy. .Pp The .Ql Cm \&:: helps avoid false matches with the .At V style .Cm \&:= modifier and since substitution always occurs the .Cm \&::= form is vaguely appropriate. .It Cm \&::?= Ns Ar str As for .Cm \&::= but only if the variable does not already have a value. .It Cm \&::+= Ns Ar str Append .Ar str to the variable. .It Cm \&::!= Ns Ar cmd Assign the output of .Ar cmd to the variable. .It Cm \&:\&[ Ns Ar range Ns Cm \&] Selects one or more words from the value, or performs other operations related to the way in which the value is divided into words. .Pp Ordinarily, a value is treated as a sequence of words delimited by white space. Some modifiers suppress this behavior, causing a value to be treated as a single word (possibly containing embedded white space). An empty value, or a value that consists entirely of white-space, is treated as a single word. For the purposes of the .Ql Cm \&:[] modifier, the words are indexed both forwards using positive integers (where index 1 represents the first word), and backwards using negative integers (where index \-1 represents the last word). .Pp The .Ar range is subjected to variable expansion, and the expanded result is then interpreted as follows: .Bl -tag -width index .\" :[n] .It Ar index Selects a single word from the value. .\" :[start..end] .It Ar start Ns Cm \&.. Ns Ar end Selects all words from .Ar start to .Ar end , inclusive. For example, .Ql Cm \&:[2..-1] selects all words from the second word to the last word. If .Ar start is greater than .Ar end , then the words are output in reverse order. For example, .Ql Cm \&:[-1..1] selects all the words from last to first. If the list is already ordered, then this effectively reverses the list, but it is more efficient to use .Ql Cm \&:Or instead of .Ql Cm \&:O:[-1..1] . .\" :[*] .It Cm \&* Causes subsequent modifiers to treat the value as a single word (possibly containing embedded white space). Analogous to the effect of \&"$*\&" in Bourne shell. .\" :[0] .It 0 Means the same as .Ql Cm \&:[*] . .\" :[*] .It Cm \&@ Causes subsequent modifiers to treat the value as a sequence of words delimited by white space. Analogous to the effect of \&"$@\&" in Bourne shell. .\" :[#] .It Cm \&# Returns the number of words in the value. .El \" :[range] .El .Sh INCLUDE STATEMENTS, CONDITIONALS AND FOR LOOPS Makefile inclusion, conditional structures and for loops reminiscent of the C programming language are provided in .Nm . All such structures are identified by a line beginning with a single dot .Pq Ql \&. character. Files are included with either .Cm \&.include \&< Ns Ar file Ns Cm \&> or .Cm \&.include \&\*q Ns Ar file Ns Cm \&\*q . Variables between the angle brackets or double quotes are expanded to form the file name. If angle brackets are used, the included makefile is expected to be in the system makefile directory. If double quotes are used, the including makefile's directory and any directories specified using the .Fl I option are searched before the system makefile directory. For compatibility with other versions of .Nm .Ql include file ... is also accepted. .Pp If the include statement is written as .Cm .-include or as .Cm .sinclude then errors locating and/or opening include files are ignored. .Pp If the include statement is written as .Cm .dinclude not only are errors locating and/or opening include files ignored, but stale dependencies within the included file will be ignored just like .Va .MAKE.DEPENDFILE . .Pp Conditional expressions are also preceded by a single dot as the first character of a line. The possible conditionals are as follows: .Bl -tag -width Ds .It Ic .error Ar message The message is printed along with the name of the makefile and line number, then .Nm will exit immediately. .It Ic .export Ar variable ... Export the specified global variable. If no variable list is provided, all globals are exported except for internal variables (those that start with .Ql \&. ) . This is not affected by the .Fl X flag, so should be used with caution. For compatibility with other .Nm programs .Ql export variable=value is also accepted. .Pp Appending a variable name to .Va .MAKE.EXPORTED is equivalent to exporting a variable. .It Ic .export-env Ar variable ... The same as .Ql .export , except that the variable is not appended to .Va .MAKE.EXPORTED . This allows exporting a value to the environment which is different from that used by .Nm internally. .It Ic .export-literal Ar variable ... The same as .Ql .export-env , except that variables in the value are not expanded. .It Ic .info Ar message The message is printed along with the name of the makefile and line number. -.It Ic .undef Ar variable -Un-define the specified global variable. -Only global variables may be un-defined. +.It Ic .undef Ar variable ... +Un-define the specified global variables. +Only global variables can be un-defined. .It Ic .unexport Ar variable ... The opposite of .Ql .export . The specified global .Va variable will be removed from .Va .MAKE.EXPORTED . If no variable list is provided, all globals are unexported, and .Va .MAKE.EXPORTED deleted. .It Ic .unexport-env Unexport all globals previously exported and clear the environment inherited from the parent. This operation will cause a memory leak of the original environment, so should be used sparingly. Testing for .Va .MAKE.LEVEL being 0, would make sense. Also note that any variables which originated in the parent environment should be explicitly preserved if desired. For example: .Bd -literal -offset indent .Li .if ${.MAKE.LEVEL} == 0 PATH := ${PATH} .Li .unexport-env .Li .export PATH .Li .endif .Pp .Ed Would result in an environment containing only .Ql Ev PATH , which is the minimal useful environment. Actually .Ql Ev .MAKE.LEVEL will also be pushed into the new environment. .It Ic .warning Ar message The message prefixed by .Ql Pa warning: is printed along with the name of the makefile and line number. .It Ic \&.if Oo \&! Oc Ns Ar expression Op Ar operator expression ... Test the value of an expression. .It Ic .ifdef Oo \&! Oc Ns Ar variable Op Ar operator variable ... Test the value of a variable. .It Ic .ifndef Oo \&! Oc Ns Ar variable Op Ar operator variable ... Test the value of a variable. .It Ic .ifmake Oo \&! Oc Ns Ar target Op Ar operator target ... Test the target being built. .It Ic .ifnmake Oo \&! Ns Oc Ar target Op Ar operator target ... Test the target being built. .It Ic .else Reverse the sense of the last conditional. .It Ic .elif Oo \&! Ns Oc Ar expression Op Ar operator expression ... A combination of .Ql Ic .else followed by .Ql Ic .if . .It Ic .elifdef Oo \&! Oc Ns Ar variable Op Ar operator variable ... A combination of .Ql Ic .else followed by .Ql Ic .ifdef . .It Ic .elifndef Oo \&! Oc Ns Ar variable Op Ar operator variable ... A combination of .Ql Ic .else followed by .Ql Ic .ifndef . .It Ic .elifmake Oo \&! Oc Ns Ar target Op Ar operator target ... A combination of .Ql Ic .else followed by .Ql Ic .ifmake . .It Ic .elifnmake Oo \&! Oc Ns Ar target Op Ar operator target ... A combination of .Ql Ic .else followed by .Ql Ic .ifnmake . .It Ic .endif End the body of the conditional. .El .Pp The .Ar operator may be any one of the following: .Bl -tag -width "Cm XX" .It Cm \&|\&| Logical OR. .It Cm \&&& Logical .Tn AND ; of higher precedence than .Dq \&|\&| . .El .Pp As in C, .Nm will only evaluate a conditional as far as is necessary to determine its value. Parentheses may be used to change the order of evaluation. The boolean operator .Ql Ic \&! may be used to logically negate an entire conditional. It is of higher precedence than .Ql Ic \&&& . .Pp The value of .Ar expression may be any of the following: .Bl -tag -width defined .It Ic defined Takes a variable name as an argument and evaluates to true if the variable has been defined. .It Ic make Takes a target name as an argument and evaluates to true if the target was specified as part of .Nm Ns 's command line or was declared the default target (either implicitly or explicitly, see .Va .MAIN ) before the line containing the conditional. .It Ic empty Takes a variable, with possible modifiers, and evaluates to true if the expansion of the variable would result in an empty string. .It Ic exists Takes a file name as an argument and evaluates to true if the file exists. The file is searched for on the system search path (see .Va .PATH ) . .It Ic target Takes a target name as an argument and evaluates to true if the target has been defined. .It Ic commands Takes a target name as an argument and evaluates to true if the target has been defined and has commands associated with it. .El .Pp .Ar Expression may also be an arithmetic or string comparison. Variable expansion is performed on both sides of the comparison, after which the numerical values are compared. A value is interpreted as hexadecimal if it is preceded by 0x, otherwise it is decimal; octal numbers are not supported. The standard C relational operators are all supported. If after variable expansion, either the left or right hand side of a .Ql Ic == or .Ql Ic "!=" operator is not a numerical value, then string comparison is performed between the expanded variables. If no relational operator is given, it is assumed that the expanded variable is being compared against 0, or an empty string in the case of a string comparison. .Pp When .Nm is evaluating one of these conditional expressions, and it encounters a (white-space separated) word it doesn't recognize, either the .Dq make or .Dq defined expression is applied to it, depending on the form of the conditional. If the form is .Ql Ic .ifdef , .Ql Ic .ifndef , or .Ql Ic .if the .Dq defined expression is applied. Similarly, if the form is .Ql Ic .ifmake or .Ql Ic .ifnmake , the .Dq make expression is applied. .Pp If the conditional evaluates to true the parsing of the makefile continues as before. If it evaluates to false, the following lines are skipped. In both cases this continues until a .Ql Ic .else or .Ql Ic .endif is found. .Pp For loops are typically used to apply a set of rules to a list of files. The syntax of a for loop is: .Pp .Bl -tag -compact -width Ds .It Ic \&.for Ar variable Oo Ar variable ... Oc Ic in Ar expression .It Aq make-lines .It Ic \&.endfor .El .Pp After the for .Ic expression is evaluated, it is split into words. On each iteration of the loop, one word is taken and assigned to each .Ic variable , in order, and these .Ic variables are substituted into the .Ic make-lines inside the body of the for loop. The number of words must come out even; that is, if there are three iteration variables, the number of words provided must be a multiple of three. .Sh COMMENTS Comments begin with a hash .Pq Ql \&# character, anywhere but in a shell command line, and continue to the end of an unescaped new line. .Sh SPECIAL SOURCES (ATTRIBUTES) .Bl -tag -width .IGNOREx .It Ic .EXEC Target is never out of date, but always execute commands anyway. .It Ic .IGNORE Ignore any errors from the commands associated with this target, exactly as if they all were preceded by a dash .Pq Ql \- . .\" .It Ic .INVISIBLE .\" XXX .\" .It Ic .JOIN .\" XXX .It Ic .MADE Mark all sources of this target as being up-to-date. .It Ic .MAKE Execute the commands associated with this target even if the .Fl n or .Fl t options were specified. Normally used to mark recursive .Nm Ns s . .It Ic .META Create a meta file for the target, even if it is flagged as .Ic .PHONY , .Ic .MAKE , or .Ic .SPECIAL . Usage in conjunction with .Ic .MAKE is the most likely case. In "meta" mode, the target is out-of-date if the meta file is missing. .It Ic .NOMETA Do not create a meta file for the target. Meta files are also not created for .Ic .PHONY , .Ic .MAKE , or .Ic .SPECIAL targets. .It Ic .NOMETA_CMP Ignore differences in commands when deciding if target is out of date. This is useful if the command contains a value which always changes. If the number of commands change, though, the target will still be out of date. The same effect applies to any command line that uses the variable .Va .OODATE , which can be used for that purpose even when not otherwise needed or desired: .Bd -literal -offset indent skip-compare-for-some: @echo this will be compared @echo this will not ${.OODATE:M.NOMETA_CMP} @echo this will also be compared .Ed The .Cm \&:M pattern suppresses any expansion of the unwanted variable. .It Ic .NOPATH Do not search for the target in the directories specified by .Ic .PATH . .It Ic .NOTMAIN Normally .Nm selects the first target it encounters as the default target to be built if no target was specified. This source prevents this target from being selected. .It Ic .OPTIONAL If a target is marked with this attribute and .Nm can't figure out how to create it, it will ignore this fact and assume the file isn't needed or already exists. .It Ic .PHONY The target does not correspond to an actual file; it is always considered to be out of date, and will not be created with the .Fl t option. Suffix-transformation rules are not applied to .Ic .PHONY targets. .It Ic .PRECIOUS When .Nm is interrupted, it normally removes any partially made targets. This source prevents the target from being removed. .It Ic .RECURSIVE Synonym for .Ic .MAKE . .It Ic .SILENT Do not echo any of the commands associated with this target, exactly as if they all were preceded by an at sign .Pq Ql @ . .It Ic .USE Turn the target into .Nm Ns 's version of a macro. When the target is used as a source for another target, the other target acquires the commands, sources, and attributes (except for .Ic .USE ) of the source. If the target already has commands, the .Ic .USE target's commands are appended to them. .It Ic .USEBEFORE Exactly like .Ic .USE , but prepend the .Ic .USEBEFORE target commands to the target. .It Ic .WAIT If .Ic .WAIT appears in a dependency line, the sources that precede it are made before the sources that succeed it in the line. Since the dependents of files are not made until the file itself could be made, this also stops the dependents being built unless they are needed for another branch of the dependency tree. So given: .Bd -literal x: a .WAIT b echo x a: echo a b: b1 echo b b1: echo b1 .Ed the output is always .Ql a , .Ql b1 , .Ql b , .Ql x . .br The ordering imposed by .Ic .WAIT is only relevant for parallel makes. .El .Sh SPECIAL TARGETS Special targets may not be included with other targets, i.e. they must be the only target specified. .Bl -tag -width .BEGINx .It Ic .BEGIN Any command lines attached to this target are executed before anything else is done. .It Ic .DEFAULT This is sort of a .Ic .USE rule for any target (that was used only as a source) that .Nm can't figure out any other way to create. Only the shell script is used. The .Ic .IMPSRC variable of a target that inherits .Ic .DEFAULT Ns 's commands is set to the target's own name. .It Ic .DELETE_ON_ERROR If this target is present in the makefile, it globally causes make to delete targets whose commands fail. (By default, only targets whose commands are interrupted during execution are deleted. This is the historical behavior.) This setting can be used to help prevent half-finished or malformed targets from being left around and corrupting future rebuilds. .It Ic .END Any command lines attached to this target are executed after everything else is done. .It Ic .ERROR Any command lines attached to this target are executed when another target fails. The .Ic .ERROR_TARGET variable is set to the target that failed. See also .Ic MAKE_PRINT_VAR_ON_ERROR . .It Ic .IGNORE Mark each of the sources with the .Ic .IGNORE attribute. If no sources are specified, this is the equivalent of specifying the .Fl i option. .It Ic .INTERRUPT If .Nm is interrupted, the commands for this target will be executed. .It Ic .MAIN If no target is specified when .Nm is invoked, this target will be built. .It Ic .MAKEFLAGS This target provides a way to specify flags for .Nm when the makefile is used. The flags are as if typed to the shell, though the .Fl f option will have no effect. .\" XXX: NOT YET!!!! .\" .It Ic .NOTPARALLEL .\" The named targets are executed in non parallel mode. .\" If no targets are .\" specified, then all targets are executed in non parallel mode. .It Ic .NOPATH Apply the .Ic .NOPATH attribute to any specified sources. .It Ic .NOTPARALLEL Disable parallel mode. .It Ic .NO_PARALLEL Synonym for .Ic .NOTPARALLEL , for compatibility with other pmake variants. .It Ic .OBJDIR The source is a new value for .Ql Va .OBJDIR . If it exists, .Nm will .Xr chdir 2 to it and update the value of .Ql Va .OBJDIR . .It Ic .ORDER The named targets are made in sequence. This ordering does not add targets to the list of targets to be made. Since the dependents of a target do not get built until the target itself could be built, unless .Ql a is built by another part of the dependency graph, the following is a dependency loop: .Bd -literal \&.ORDER: b a b: a .Ed .Pp The ordering imposed by .Ic .ORDER is only relevant for parallel makes. .\" XXX: NOT YET!!!! .\" .It Ic .PARALLEL .\" The named targets are executed in parallel mode. .\" If no targets are .\" specified, then all targets are executed in parallel mode. .It Ic .PATH The sources are directories which are to be searched for files not found in the current directory. If no sources are specified, any previously specified directories are deleted. If the source is the special .Ic .DOTLAST target, then the current working directory is searched last. .It Ic .PATH. Ns Va suffix Like .Ic .PATH but applies only to files with a particular suffix. The suffix must have been previously declared with .Ic .SUFFIXES . .It Ic .PHONY Apply the .Ic .PHONY attribute to any specified sources. .It Ic .PRECIOUS Apply the .Ic .PRECIOUS attribute to any specified sources. If no sources are specified, the .Ic .PRECIOUS attribute is applied to every target in the file. .It Ic .SHELL Sets the shell that .Nm will use to execute commands. The sources are a set of .Ar field=value pairs. .Bl -tag -width hasErrCtls .It Ar name This is the minimal specification, used to select one of the built-in shell specs; .Ar sh , .Ar ksh , and .Ar csh . .It Ar path Specifies the path to the shell. .It Ar hasErrCtl Indicates whether the shell supports exit on error. .It Ar check The command to turn on error checking. .It Ar ignore The command to disable error checking. .It Ar echo The command to turn on echoing of commands executed. .It Ar quiet The command to turn off echoing of commands executed. .It Ar filter The output to filter after issuing the .Ar quiet command. It is typically identical to .Ar quiet . .It Ar errFlag The flag to pass the shell to enable error checking. .It Ar echoFlag The flag to pass the shell to enable command echoing. .It Ar newline The string literal to pass the shell that results in a single newline character when used outside of any quoting characters. .El Example: .Bd -literal \&.SHELL: name=ksh path=/bin/ksh hasErrCtl=true \e check="set \-e" ignore="set +e" \e echo="set \-v" quiet="set +v" filter="set +v" \e echoFlag=v errFlag=e newline="'\en'" .Ed .It Ic .SILENT Apply the .Ic .SILENT attribute to any specified sources. If no sources are specified, the .Ic .SILENT attribute is applied to every command in the file. .It Ic .STALE This target gets run when a dependency file contains stale entries, having .Va .ALLSRC set to the name of that dependency file. .It Ic .SUFFIXES Each source specifies a suffix to .Nm . If no sources are specified, any previously specified suffixes are deleted. It allows the creation of suffix-transformation rules. .Pp Example: .Bd -literal \&.SUFFIXES: .o \&.c.o: cc \-o ${.TARGET} \-c ${.IMPSRC} .Ed .El .Sh ENVIRONMENT .Nm uses the following environment variables, if they exist: .Ev MACHINE , .Ev MACHINE_ARCH , .Ev MAKE , .Ev MAKEFLAGS , .Ev MAKEOBJDIR , .Ev MAKEOBJDIRPREFIX , .Ev MAKESYSPATH , .Ev PWD , and .Ev TMPDIR . .Pp .Ev MAKEOBJDIRPREFIX and .Ev MAKEOBJDIR may only be set in the environment or on the command line to .Nm and not as makefile variables; see the description of .Ql Va .OBJDIR for more details. .Sh FILES .Bl -tag -width /usr/share/mk -compact .It .depend list of dependencies .It Makefile list of dependencies .It makefile list of dependencies .It sys.mk system makefile .It /usr/share/mk system makefile directory .El .Sh COMPATIBILITY The basic make syntax is compatible between different versions of make; however the special variables, variable modifiers and conditionals are not. .Ss Older versions An incomplete list of changes in older versions of .Nm : .Pp The way that .for loop variables are substituted changed after NetBSD 5.0 so that they still appear to be variable expansions. In particular this stops them being treated as syntax, and removes some obscure problems using them in .if statements. .Pp The way that parallel makes are scheduled changed in NetBSD 4.0 so that .ORDER and .WAIT apply recursively to the dependent nodes. The algorithms used may change again in the future. .Ss Other make dialects Other make dialects (GNU make, SVR4 make, POSIX make, etc.) do not support most of the features of .Nm as described in this manual. Most notably: .Bl -bullet -offset indent .It The .Ic .WAIT and .Ic .ORDER declarations and most functionality pertaining to parallelization. (GNU make supports parallelization but lacks these features needed to control it effectively.) .It Directives, including for loops and conditionals and most of the forms of include files. (GNU make has its own incompatible and less powerful syntax for conditionals.) .It All built-in variables that begin with a dot. .It Most of the special sources and targets that begin with a dot, with the notable exception of .Ic .PHONY , .Ic .PRECIOUS , and .Ic .SUFFIXES . .It Variable modifiers, except for the .Dl :old=new string substitution, which does not portably support globbing with .Ql % and historically only works on declared suffixes. .It The .Ic $> variable even in its short form; most makes support this functionality but its name varies. .El .Pp Some features are somewhat more portable, such as assignment with .Ic += , .Ic ?= , and .Ic != . The .Ic .PATH functionality is based on an older feature .Ic VPATH found in GNU make and many versions of SVR4 make; however, historically its behavior is too ill-defined (and too buggy) to rely upon. .Pp The .Ic $@ and .Ic $< variables are more or less universally portable, as is the .Ic $(MAKE) variable. Basic use of suffix rules (for files only in the current directory, not trying to chain transformations together, etc.) is also reasonably portable. .Sh SEE ALSO .Xr mkdep 1 .Sh HISTORY .Nm is derived from NetBSD .Xr make 1 . It uses autoconf to facilitate portability to other platforms. .Pp A make command appeared in .At v7 . This make implementation is based on Adam De Boor's pmake program which was written for Sprite at Berkeley. It was designed to be a parallel distributed make running jobs on different machines using a daemon called .Dq customs . .Pp Historically the target/dependency .Dq FRC has been used to FoRCe rebuilding (since the target/dependency does not exist... unless someone creates an .Dq FRC file). .Sh BUGS The make syntax is difficult to parse without actually acting on the data. For instance, finding the end of a variable's use should involve scanning each of the modifiers, using the correct terminator for each field. In many places make just counts {} and () in order to find the end of a variable expansion. .Pp There is no way of escaping a space character in a filename. diff --git a/bmake.cat1 b/bmake.cat1 index 46e07ba9cc4f..9ed1dcdd9018 100644 --- a/bmake.cat1 +++ b/bmake.cat1 @@ -1,1580 +1,1584 @@ BMAKE(1) FreeBSD General Commands Manual BMAKE(1) NAME bmake -- maintain program dependencies SYNOPSIS bmake [-BeikNnqrSstWwX] [-C directory] [-D variable] [-d flags] [-f makefile] [-I directory] [-J private] [-j max_jobs] [-m directory] [-T file] [-V variable] [-v variable] [variable=value] [target ...] DESCRIPTION bmake is a program designed to simplify the maintenance of other pro- grams. Its input is a list of specifications as to the files upon which programs and other files depend. If no -f makefile makefile option is given, bmake will try to open `makefile' then `Makefile' in order to find the specifications. If the file `.depend' exists, it is read (see mkdep(1)). This manual page is intended as a reference document only. For a more thorough description of bmake and makefiles, please refer to PMake - A Tutorial. bmake will prepend the contents of the MAKEFLAGS environment variable to the command line arguments before parsing them. The options are as follows: -B Try to be backwards compatible by executing a single shell per command and by executing the commands to make the sources of a dependency line in sequence. -C directory Change to directory before reading the makefiles or doing any- thing else. If multiple -C options are specified, each is inter- preted relative to the previous one: -C / -C etc is equivalent to -C /etc. -D variable Define variable to be 1, in the global context. -d [-]flags Turn on debugging, and specify which portions of bmake are to print debugging information. Unless the flags are preceded by `-' they are added to the MAKEFLAGS environment variable and will be processed by any child make processes. By default, debugging information is printed to standard error, but this can be changed - using the F debugging flag. The debugging output is always - unbuffered; in addition, if debugging is enabled but debugging - output is not directed to standard output, then the standard out- - put is line buffered. Flags is one or more of the following: + using the F debugging flag. The debugging output is always un- + buffered; in addition, if debugging is enabled but debugging out- + put is not directed to standard output, then the standard output + is line buffered. Flags is one or more of the following: A Print all possible debugging information; equivalent to specifying all of the debugging flags. a Print debugging information about archive searching and caching. C Print debugging information about current working direc- tory. c Print debugging information about conditional evaluation. d Print debugging information about directory searching and caching. e Print debugging information about failed commands and targets. F[+]filename Specify where debugging output is written. This must be the last flag, because it consumes the remainder of the argument. If the character immediately after the `F' flag is `+', then the file will be opened in append mode; otherwise the file will be overwritten. If the file name is `stdout' or `stderr' then debugging output will be written to the standard output or standard error output file descriptors respectively (and the `+' option has no effect). Otherwise, the output will be written to the named file. If the file name ends `.%d' then the `%d' is replaced by the pid. f Print debugging information about loop evaluation. g1 Print the input graph before making anything. g2 Print the input graph after making everything, or before exiting on error. g3 Print the input graph before exiting on error. h Print debugging information about hash table operations. j Print debugging information about running multiple shells. L Turn on lint checks. This will throw errors for variable assignments that do not parse correctly, at the time of assignment so the file and line number are available. l Print commands in Makefiles regardless of whether or not they are prefixed by `@' or other "quiet" flags. Also known as "loud" behavior. M Print debugging information about "meta" mode decisions about targets. m Print debugging information about making targets, includ- ing modification dates. n Don't delete the temporary command scripts created when running commands. These temporary scripts are created in the directory referred to by the TMPDIR environment vari- able, or in /tmp if TMPDIR is unset or set to the empty string. The temporary scripts are created by mkstemp(3), and have names of the form makeXXXXXX. NOTE: This can create many files in TMPDIR or /tmp, so use with care. p Print debugging information about makefile parsing. s Print debugging information about suffix-transformation rules. t Print debugging information about target list mainte- nance. V Force the -V option to print raw values of variables, overriding the default behavior set via .MAKE.EXPAND_VARIABLES. v Print debugging information about variable assignment. x Run shell commands with -x so the actual commands are printed as they are executed. -e Specify that environment variables override macro assignments within makefiles. -f makefile Specify a makefile to read instead of the default `makefile'. If makefile is `-', standard input is read. Multiple makefiles may be specified, and are read in the order specified. -I directory Specify a directory in which to search for makefiles and included makefiles. The system makefile directory (or directories, see the -m option) is automatically included as part of this list. -i Ignore non-zero exit of shell commands in the makefile. Equiva- lent to specifying `-' before each command line in the makefile. -J private This option should not be specified by the user. When the j option is in use in a recursive build, this option is passed by a make to child makes to allow all the make processes in the build to cooperate to avoid overloading the system. -j max_jobs Specify the maximum number of jobs that bmake may have running at any one time. The value is saved in .MAKE.JOBS. Turns compati- bility mode off, unless the B flag is also specified. When com- patibility mode is off, all commands associated with a target are executed in a single shell invocation as opposed to the tradi- tional one shell invocation per line. This can break traditional scripts which change directories on each command invocation and then expect to start with a fresh environment on the next line. It is more efficient to correct the scripts rather than turn backwards compatibility on. -k Continue processing after errors are encountered, but only on those targets that do not depend on the target whose creation caused the error. -m directory Specify a directory in which to search for sys.mk and makefiles included via the <file>-style include statement. The -m option can be used multiple times to form a search path. This path will override the default system include path: /usr/share/mk. Fur- thermore the system include path will be appended to the search - path used for "file"-style include statements (see the -I - option). + path used for "file"-style include statements (see the -I op- + tion). If a file or directory name in the -m argument (or the MAKESYSPATH environment variable) starts with the string ".../" then bmake will search for the specified file or directory named in the remaining part of the argument string. The search starts with the current directory of the Makefile and then works upward towards the root of the file system. If the search is success- ful, then the resulting directory replaces the ".../" specifica- tion in the -m argument. If used, this feature allows bmake to easily search in the current source tree for customized sys.mk files (e.g., by using ".../mk/sys.mk" as an argument). -n Display the commands that would have been executed, but do not actually execute them unless the target depends on the .MAKE spe- cial source (see below) or the command is prefixed with `+'. -N Display the commands which would have been executed, but do not actually execute any of them; useful for debugging top-level makefiles without descending into subdirectories. -q Do not execute any commands, but exit 0 if the specified targets are up-to-date and 1, otherwise. -r Do not use the built-in rules specified in the system makefile. -S Stop processing if an error is encountered. This is the default behavior and the opposite of -k. -s Do not echo any commands as they are executed. Equivalent to specifying `@' before each command line in the makefile. -T tracefile When used with the -j flag, append a trace record to tracefile for each job started and completed. -t Rather than re-building a target as specified in the makefile, create it or update its modification time to make it appear up- to-date. -V variable Print the value of variable. Do not build any targets. Multiple instances of this option may be specified; the variables will be printed one per line, with a blank line for each null or unde- fined variable. The value printed is extracted from the global context after all makefiles have been read. By default, the raw variable contents (which may include additional unexpanded vari- able references) are shown. If variable contains a `$' then the value will be recursively expanded to its complete resultant text before printing. The expanded value will also be printed if .MAKE.EXPAND_VARIABLES is set to true and the -dV option has not been used to override it. Note that loop-local and target-local variables, as well as values taken temporarily by global vari- - ables during makefile processing, are not accessible via this - option. The -dv debug mode can be used to see these at the cost - of generating substantial extraneous output. + ables during makefile processing, are not accessible via this op- + tion. The -dv debug mode can be used to see these at the cost of + generating substantial extraneous output. -v variable Like -V but the variable is always expanded to its complete value. -W Treat any warnings during makefile parsing as errors. -w Print entering and leaving directory messages, pre and post pro- cessing. -X Don't export variables passed on the command line to the environ- ment individually. Variables passed on the command line are - still exported via the MAKEFLAGS environment variable. This - option may be useful on systems which have a small limit on the + still exported via the MAKEFLAGS environment variable. This op- + tion may be useful on systems which have a small limit on the size of command arguments. variable=value Set the value of the variable variable to value. Normally, all values passed on the command line are also exported to sub-makes in the environment. The -X flag disables this behavior. Vari- able assignments should follow options for POSIX compatibility but no ordering is enforced. There are seven different types of lines in a makefile: file dependency specifications, shell commands, variable assignments, include statements, conditional directives, for loops, and comments. In general, lines may be continued from one line to the next by ending them with a backslash (`\'). The trailing newline character and initial whitespace on the following line are compressed into a single space. FILE DEPENDENCY SPECIFICATIONS Dependency lines consist of one or more targets, an operator, and zero or - more sources. This creates a relationship where the targets ``depend'' - on the sources and are customarily created from them. A target is con- - sidered out-of-date if it does not exist, or if its modification time is + more sources. This creates a relationship where the targets "depend" on + the sources and are customarily created from them. A target is consid- + ered out-of-date if it does not exist, or if its modification time is less than that of any of its sources. An out-of-date target will be re- created, but not until all sources have been examined and themselves re- created as needed. Three operators may be used: : Many dependency lines may name this target but only one may have attached shell commands. All sources named in all dependency lines are considered together, and if needed the attached shell commands are run to create or re-create the target. If bmake is inter- rupted, the target is removed. ! The same, but the target is always re-created whether or not it is out of date. :: Any dependency line may have attached shell commands, but each one - is handled independently: its sources are considered and the - attached shell commands are run if the target is out of date with - respect to (only) those sources. Thus, different groups of the - attached shell commands may be run depending on the circumstances. + is handled independently: its sources are considered and the at- + tached shell commands are run if the target is out of date with re- + spect to (only) those sources. Thus, different groups of the at- + tached shell commands may be run depending on the circumstances. Furthermore, unlike :, for dependency lines with no sources, the attached shell commands are always run. Also unlike :, the target will not be removed if bmake is interrupted. - All dependency lines mentioning a particular target must use the same - operator. + All dependency lines mentioning a particular target must use the same op- + erator. Targets and sources may contain the shell wildcard values `?', `*', `[]', and `{}'. The values `?', `*', and `[]' may only be used as part of the - final component of the target or source, and must be used to describe - existing files. The value `{}' need not necessarily be used to describe + final component of the target or source, and must be used to describe ex- + isting files. The value `{}' need not necessarily be used to describe existing files. Expansion is in directory order, not alphabetically as done in the shell. SHELL COMMANDS Each target may have associated with it one or more lines of shell com- mands, normally used to create the target. Each of the lines in this script must be preceded by a tab. (For historical reasons, spaces are - not accepted.) While targets can appear in many dependency lines if - desired, by default only one of these rules may be followed by a creation + not accepted.) While targets can appear in many dependency lines if de- + sired, by default only one of these rules may be followed by a creation script. If the `::' operator is used, however, all rules may include scripts and the scripts are executed in the order found. Each line is treated as a separate shell command, unless the end of line is escaped with a backslash (`\') in which case that line and the next are combined. If the first characters of the command are any combination of `@', `+', or `-', the command is treated specially. A `@' causes the command not to be echoed before it is executed. A `+' causes the command to be executed even when -n is given. This is similar to the effect of the .MAKE special source, except that the effect can be limited to a sin- gle line of a script. A `-' in compatibility mode causes any non-zero exit status of the command line to be ignored. When bmake is run in jobs mode with -j max_jobs, the entire script for the target is fed to a single instance of the shell. In compatibility (non-jobs) mode, each command is run in a separate process. If the com- mand contains any shell meta characters (`#=|^(){};&<>*?[]:$`\\n') it will be passed to the shell; otherwise bmake will attempt direct execu- tion. If a line starts with `-' and the shell has ErrCtl enabled then failure of the command line will be ignored as in compatibility mode. Otherwise `-' affects the entire job; the script will stop at the first command line that fails, but the target will not be deemed to have failed. Makefiles should be written so that the mode of bmake operation does not - change their behavior. For example, any command which needs to use - ``cd'' or ``chdir'' without potentially changing the directory for subse- - quent commands should be put in parentheses so it executes in a subshell. - To force the use of one shell, escape the line breaks so as to make the + change their behavior. For example, any command which needs to use "cd" + or "chdir" without potentially changing the directory for subsequent com- + mands should be put in parentheses so it executes in a subshell. To + force the use of one shell, escape the line breaks so as to make the whole script one command. For example: avoid-chdir-side-effects: @echo Building $@ in `pwd` @(cd ${.CURDIR} && ${MAKE} $@) @echo Back in `pwd` ensure-one-shell-regardless-of-mode: @echo Building $@ in `pwd`; \ (cd ${.CURDIR} && ${MAKE} $@); \ echo Back in `pwd` Since bmake will chdir(2) to `.OBJDIR' before executing any targets, each child process starts with that as its current working directory. VARIABLE ASSIGNMENTS Variables in make are much like variables in the shell, and, by tradi- tion, consist of all upper-case letters. Variable assignment modifiers The five operators that can be used to assign values to variables are as follows: = Assign the value to the variable. Any previous value is overrid- den. += Append the value to the current value of the variable. ?= Assign the value to the variable if it is not already defined. := Assign with expansion, i.e. expand the value before assigning it to the variable. Normally, expansion is not done until the vari- able is referenced. NOTE: References to undefined variables are not expanded. This can cause problems when variable modifiers are used. - != Expand the value and pass it to the shell for execution and - assign the result to the variable. Any newlines in the result - are replaced with spaces. + != Expand the value and pass it to the shell for execution and as- + sign the result to the variable. Any newlines in the result are + replaced with spaces. - Any white-space before the assigned value is removed; if the value is - being appended, a single space is inserted between the previous contents - of the variable and the appended value. + Any white-space before the assigned value is removed; if the value is be- + ing appended, a single space is inserted between the previous contents of + the variable and the appended value. Variables are expanded by surrounding the variable name with either curly braces (`{}') or parentheses (`()') and preceding it with a dollar sign (`$'). If the variable name contains only a single letter, the surround- ing braces or parentheses are not required. This shorter form is not recommended. If the variable name contains a dollar, then the name itself is expanded first. This allows almost arbitrary variable names, however names con- taining dollar, braces, parentheses, or whitespace are really best avoided! If the result of expanding a variable contains a dollar sign (`$') the string is expanded again. Variable substitution occurs at three distinct times, depending on where the variable is being used. 1. Variables in dependency lines are expanded as the line is read. 2. Variables in shell commands are expanded when the shell command is executed. - 3. ``.for'' loop index variables are expanded on each loop iteration. + 3. ".for" loop index variables are expanded on each loop iteration. Note that other variables are not expanded inside loops so the fol- lowing example code: .for i in 1 2 3 a+= ${i} j= ${i} b+= ${j} .endfor all: @echo ${a} @echo ${b} will print: 1 2 3 3 3 3 - Because while ${a} contains ``1 2 3'' after the loop is executed, - ${b} contains ``${j} ${j} ${j}'' which expands to ``3 3 3'' since - after the loop completes ${j} contains ``3''. + Because while ${a} contains "1 2 3" after the loop is executed, ${b} + contains "${j} ${j} ${j}" which expands to "3 3 3" since after the + loop completes ${j} contains "3". Variable classes The four different classes of variables (in order of increasing prece- dence) are: Environment variables Variables defined as part of bmake's environment. Global variables Variables defined in the makefile or in included makefiles. Command line variables Variables defined as part of the command line. Local variables Variables that are defined specific to a certain target. Local variables are all built in and their values vary magically from target to target. It is not currently possible to define new local vari- ables. The seven local variables are as follows: .ALLSRC The list of all sources for this target; also known as `>'. .ARCHIVE The name of the archive file; also known as `!'. .IMPSRC In suffix-transformation rules, the name/path of the source from which the target is to be transformed (the - ``implied'' source); also known as `<'. It is not - defined in explicit rules. + "implied" source); also known as `<'. It is not defined + in explicit rules. .MEMBER The name of the archive member; also known as `%'. .OODATE The list of sources for this target that were deemed out- of-date; also known as `?'. .PREFIX The file prefix of the target, containing only the file portion, no suffix or preceding directory components; also known as `*'. The suffix must be one of the known suffixes declared with .SUFFIXES or it will not be recog- nized. .TARGET The name of the target; also known as `@'. For compati- bility with other makes this is an alias for .ARCHIVE in archive member rules. The shorter forms (`>', `!', `<', `%', `?', `*', and `@') are permitted for backward compatibility with historical makefiles and legacy POSIX make and are not recommended. Variants of these variables with the punctuation followed immediately by `D' or `F', e.g. `$(@D)', are legacy forms equivalent to using the `:H' and `:T' modifiers. These forms are accepted for compatibility with AT&T System V UNIX makefiles and POSIX but are not recommended. Four of the local variables may be used in sources on dependency lines because they expand to the proper value for each target on the line. These variables are `.TARGET', `.PREFIX', `.ARCHIVE', and `.MEMBER'. Additional built-in variables In addition, bmake sets or knows about the following variables: $ A single dollar sign `$', i.e. `$$' expands to a single dollar sign. .ALLTARGETS The list of all targets encountered in the Makefile. If evaluated during Makefile parsing, lists only those tar- gets encountered thus far. .CURDIR A path to the directory where bmake was executed. Refer to the description of `PWD' for more details. .INCLUDEDFROMDIR The directory of the file this Makefile was included from. .INCLUDEDFROMFILE The filename of the file this Makefile was included from. MAKE The name that bmake was executed with (argv[0]). For compatibility bmake also sets .MAKE with the same value. The preferred variable to use is the environment variable MAKE because it is more compatible with other versions of bmake and cannot be confused with the special target with the same name. .MAKE.DEPENDFILE Names the makefile (default `.depend') from which gener- ated dependencies are read. .MAKE.EXPAND_VARIABLES A boolean that controls the default behavior of the -V option. If true, variable values printed with -V are fully expanded; if false, the raw variable contents (which may include additional unexpanded variable refer- ences) are shown. .MAKE.EXPORTED The list of variables exported by bmake. .MAKE.JOBS The argument to the -j option. .MAKE.JOB.PREFIX If bmake is run with j then output for each target is prefixed with a token `--- target ---' the first part of which can be controlled via .MAKE.JOB.PREFIX. If .MAKE.JOB.PREFIX is empty, no token is printed. For example: .MAKE.JOB.PREFIX=${.newline}---${.MAKE:T}[${.MAKE.PID}] would produce tokens like `---make[1234] target ---' mak- ing it easier to track the degree of parallelism being achieved. MAKEFLAGS The environment variable `MAKEFLAGS' may contain anything that may be specified on bmake's command line. Anything specified on bmake's command line is appended to the `MAKEFLAGS' variable which is then entered into the envi- ronment for all programs which bmake executes. .MAKE.LEVEL The recursion depth of bmake. The initial instance of bmake will be 0, and an incremented value is put into the - environment to be seen by the next generation. This - allows tests like: .if ${.MAKE.LEVEL} == 0 to protect - things which should only be evaluated in the initial - instance of bmake. + environment to be seen by the next generation. This al- + lows tests like: .if ${.MAKE.LEVEL} == 0 to protect + things which should only be evaluated in the initial in- + stance of bmake. .MAKE.MAKEFILE_PREFERENCE The ordered list of makefile names (default `makefile', `Makefile') that bmake will look for. .MAKE.MAKEFILES The list of makefiles read by bmake, which is useful for tracking dependencies. Each makefile is recorded only once, regardless of the number of times read. .MAKE.MODE Processed after reading all makefiles. Can affect the mode that bmake runs in. It can contain a number of key- words: compat Like -B, puts bmake into "compat" mode. meta Puts bmake into "meta" mode, where meta files are created for each tar- get to capture the command run, the output generated and if filemon(4) is available, the system calls which are of interest to bmake. The cap- tured output can be very useful when diagnosing errors. curdirOk= bf Normally bmake will not create .meta files in `.CURDIR'. This can be overridden by setting bf to a value which represents True. missing-meta= bf If bf is True, then a missing .meta file makes the target out-of-date. missing-filemon= bf If bf is True, then missing filemon data makes the target out-of-date. nofilemon Do not use filemon(4). env For debugging, it can be useful to include the environment in the .meta file. verbose If in "meta" mode, print a clue about the target being built. This is useful if the build is otherwise running silently. The message printed the value of: .MAKE.META.PREFIX. ignore-cmd Some makefiles have commands which are simply not stable. This keyword causes them to be ignored for deter- mining whether a target is out of date in "meta" mode. See also .NOMETA_CMP. silent= bf If bf is True, when a .meta file is created, mark the target .SILENT. .MAKE.META.BAILIWICK In "meta" mode, provides a list of prefixes which match the directories controlled by bmake. If a file that was generated outside of .OBJDIR but within said bailiwick is missing, the current target is considered out-of-date. .MAKE.META.CREATED In "meta" mode, this variable contains a list of all the meta files updated. If not empty, it can be used to trigger processing of .MAKE.META.FILES. .MAKE.META.FILES In "meta" mode, this variable contains a list of all the meta files used (updated or not). This list can be used to process the meta files to extract dependency informa- tion. .MAKE.META.IGNORE_PATHS Provides a list of path prefixes that should be ignored; because the contents are expected to change over time. The default list includes: `/dev /etc /proc /tmp /var/run /var/tmp' .MAKE.META.IGNORE_PATTERNS Provides a list of patterns to match against pathnames. Ignore any that match. .MAKE.META.IGNORE_FILTER Provides a list of variable modifiers to apply to each pathname. Ignore if the expansion is an empty string. .MAKE.META.PREFIX Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: Building ${.TARGET:H:tA}/${.TARGET:T} .MAKEOVERRIDES This variable is used to record the names of variables - assigned to on the command line, so that they may be - exported as part of `MAKEFLAGS'. This behavior can be - disabled by assigning an empty value to `.MAKEOVERRIDES' + assigned to on the command line, so that they may be ex- + ported as part of `MAKEFLAGS'. This behavior can be dis- + abled by assigning an empty value to `.MAKEOVERRIDES' within a makefile. Extra variables can be exported from a makefile by appending their names to `.MAKEOVERRIDES'. `MAKEFLAGS' is re-exported whenever `.MAKEOVERRIDES' is modified. .MAKE.PATH_FILEMON If bmake was built with filemon(4) support, this is set to the path of the device node. This allows makefiles to test for this support. .MAKE.PID The process-id of bmake. .MAKE.PPID The parent process-id of bmake. .MAKE.SAVE_DOLLARS value should be a boolean that controls whether `$$' are preserved when doing `:=' assignments. The default is false, for backwards compatibility. Set to true for com- - patability with other makes. If set to false, `$$' - becomes `$' per normal evaluation rules. + patability with other makes. If set to false, `$$' be- + comes `$' per normal evaluation rules. + + .MAKE.UID The user-id running bmake. + + .MAKE.GID The group-id running bmake. MAKE_PRINT_VAR_ON_ERROR When bmake stops due to an error, it sets `.ERROR_TARGET' to the name of the target that failed, `.ERROR_CMD' to the commands of the failed target, and in "meta" mode, it also sets `.ERROR_CWD' to the getcwd(3), and `.ERROR_META_FILE' to the path of the meta file (if any) describing the failed target. It then prints its name and the value of `.CURDIR' as well as the value of any variables named in `MAKE_PRINT_VAR_ON_ERROR'. .newline This variable is simply assigned a newline character as its value. This allows expansions using the :@ modifier to put a newline between iterations of the loop rather than a space. For example, the printing of `MAKE_PRINT_VAR_ON_ERROR' could be done as ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@}. .OBJDIR A path to the directory where the targets are built. Its value is determined by trying to chdir(2) to the follow- ing directories in order and using the first match: 1. ${MAKEOBJDIRPREFIX}${.CURDIR} (Only if `MAKEOBJDIRPREFIX' is set in the environ- ment or on the command line.) 2. ${MAKEOBJDIR} (Only if `MAKEOBJDIR' is set in the environment or on the command line.) 3. ${.CURDIR}/obj.${MACHINE} 4. ${.CURDIR}/obj 5. /usr/obj/${.CURDIR} 6. ${.CURDIR} Variable expansion is performed on the value before it's used, so expressions such as ${.CURDIR:S,^/usr/src,/var/obj,} may be used. This is especially useful with `MAKEOBJDIR'. `.OBJDIR' may be modified in the makefile via the special target `.OBJDIR'. In all cases, bmake will chdir(2) to the specified directory if it exists, and set `.OBJDIR' and `PWD' to that directory before executing any targets. Except in the case of an explicit `.OBJDIR' target, bmake will check that the specified directory is writable and ignore it if not. This check can be skipped by setting the environment variable `MAKE_OBJDIR_CHECK_WRITABLE' to "no". .PARSEDIR A path to the directory of the current `Makefile' being parsed. .PARSEFILE The basename of the current `Makefile' being parsed. This variable and `.PARSEDIR' are both set only while the `Makefiles' are being parsed. If you want to retain - their current values, assign them to a variable using - assignment with expansion: (`:='). + their current values, assign them to a variable using as- + signment with expansion: (`:='). .PATH A variable that represents the list of directories that bmake will search for files. The search list should be updated using the target `.PATH' rather than the vari- able. PWD Alternate path to the current directory. bmake normally sets `.CURDIR' to the canonical path given by getcwd(3). However, if the environment variable `PWD' is set and gives a path to the current directory, then bmake sets `.CURDIR' to the value of `PWD' instead. This behavior is disabled if `MAKEOBJDIRPREFIX' is set or `MAKEOBJDIR' contains a variable transform. `PWD' is set to the value of `.OBJDIR' for all programs which bmake executes. .SHELL The pathname of the shell used to run target scripts. It is read-only. .TARGETS The list of targets explicitly specified on the command line, if any. - VPATH Colon-separated (``:'') lists of directories that bmake + VPATH Colon-separated (":") lists of directories that bmake will search for files. The variable is supported for compatibility with old make programs only, use `.PATH' instead. Variable modifiers Variable expansion may be modified to select or modify each word of the - variable (where a ``word'' is white-space delimited sequence of charac- + variable (where a "word" is white-space delimited sequence of charac- ters). The general format of a variable expansion is as follows: ${variable[:modifier[:...]]} Each modifier begins with a colon, which may be escaped with a backslash (`\'). A set of modifiers can be specified via a variable, as follows: modifier_variable=modifier[:...] ${variable:${modifier_variable}[:...]} In this case the first modifier in the modifier_variable does not start with a colon, since that must appear in the referencing variable. If any of the modifiers in the modifier_variable contain a dollar sign (`$'), these must be doubled to avoid early expansion. The supported modifiers are: :E Replaces each word in the variable with its suffix. :H Replaces each word in the variable with everything but the last com- ponent. :Mpattern Selects only those words that match pattern. The standard shell wildcard characters (`*', `?', and `[]') may be used. The wildcard characters may be escaped with a backslash (`\'). As a consequence of the way values are split into words, matched, and then joined, a construct like ${VAR:M*} will normalize the inter-word spacing, removing all leading and trailing space, and converting multiple consecutive spaces to single spaces. :Npattern This is identical to `:M', but selects all words which do not match pattern. :O Orders every word in variable alphabetically. :Or Orders every word in variable in reverse alphabetical order. :Ox Shuffles the words in variable. The results will be different each time you are referring to the modified variable; use the assignment with expansion (`:=') to prevent such behavior. For example, LIST= uno due tre quattro RANDOM_LIST= ${LIST:Ox} STATIC_RANDOM_LIST:= ${LIST:Ox} all: @echo "${RANDOM_LIST}" @echo "${RANDOM_LIST}" @echo "${STATIC_RANDOM_LIST}" @echo "${STATIC_RANDOM_LIST}" may produce output similar to: quattro due tre uno tre due quattro uno due uno quattro tre due uno quattro tre :Q Quotes every shell meta-character in the variable, so that it can be passed safely to the shell. :q Quotes every shell meta-character in the variable, and also doubles - `$' characters so that it can be passed safely through recursive - invocations of bmake. This is equivalent to: `:S/\$/&&/g:Q'. + `$' characters so that it can be passed safely through recursive in- + vocations of bmake. This is equivalent to: `:S/\$/&&/g:Q'. :R Replaces each word in the variable with everything but its suffix. :range[=count] The value is an integer sequence representing the words of the orig- inal value, or the supplied count. :gmtime[=utc] The value is a format string for strftime(3), using gmtime(3). If a utc value is not provided or is 0, the current time is used. :hash Computes a 32-bit hash of the value and encode it as hex digits. :localtime[=utc] The value is a format string for strftime(3), using localtime(3). If a utc value is not provided or is 0, the current time is used. :tA Attempts to convert variable to an absolute path using realpath(3), if that fails, the value is unchanged. :tl Converts variable to lower-case letters. :tsc Words in the variable are normally separated by a space on expan- sion. This modifier sets the separator to the character c. If c is omitted, then no separator is used. The common escapes (including octal numeric codes) work as expected. :tu Converts variable to upper-case letters. :tW Causes the value to be treated as a single word (possibly containing embedded white space). See also `:[*]'. :tw Causes the value to be treated as a sequence of words delimited by white space. See also `:[@]'. :S/old_string/new_string/[1gW] Modifies the first occurrence of old_string in each word of the - variable's value, replacing it with new_string. If a `g' is - appended to the last delimiter of the pattern, all occurrences in - each word are replaced. If a `1' is appended to the last delimiter - of the pattern, only the first occurrence is affected. If a `W' is - appended to the last delimiter of the pattern, then the value is + variable's value, replacing it with new_string. If a `g' is ap- + pended to the last delimiter of the pattern, all occurrences in each + word are replaced. If a `1' is appended to the last delimiter of + the pattern, only the first occurrence is affected. If a `W' is ap- + pended to the last delimiter of the pattern, then the value is treated as a single word (possibly containing embedded white space). If old_string begins with a caret (`^'), old_string is anchored at the beginning of each word. If old_string ends with a dollar sign (`$'), it is anchored at the end of each word. Inside new_string, an ampersand (`&') is replaced by old_string (without any `^' or `$'). Any character may be used as a delimiter for the parts of the modifier string. The anchoring, ampersand and delimiter characters may be escaped with a backslash (`\'). Variable expansion occurs in the normal fashion inside both old_string and new_string with the single exception that a backslash is used to prevent the expansion of a dollar sign (`$'), not a pre- ceding dollar sign as is usual. :C/pattern/replacement/[1gW] The :C modifier is just like the :S modifier except that the old and new strings, instead of being simple strings, are an extended regu- lar expression (see regex(3)) string pattern and an ed(1)-style string replacement. Normally, the first occurrence of the pattern pattern in each word of the value is substituted with replacement. The `1' modifier causes the substitution to apply to at most one word; the `g' modifier causes the substitution to apply to as many instances of the search pattern pattern as occur in the word or words it is found in; the `W' modifier causes the value to be treated as a single word (possibly containing embedded white space). As for the :S modifier, the pattern and replacement are subjected to variable expansion before being parsed as regular expressions. :T Replaces each word in the variable with its last path component. :u Removes adjacent duplicate words (like uniq(1)). :?true_string:false_string If the variable name (not its value), when parsed as a .if condi- tional expression, evaluates to true, return as its value the true_string, otherwise return the false_string. Since the variable name is used as the expression, :? must be the first modifier after the variable name itself - which will, of course, usually contain variable expansions. A common error is trying to use expressions like ${NUMBERS:M42:?match:no} which actually tests defined(NUMBERS), to determine if any words match "42" you need to use something like: ${"${NUMBERS:M42}" != "":?match:no}. :old_string=new_string This is the AT&T System V UNIX style variable substitution. It must be the last modifier specified. If old_string or new_string do not contain the pattern matching character % then it is assumed that - they are anchored at the end of each word, so only suffixes or - entire words may be replaced. Otherwise % is the substring of + they are anchored at the end of each word, so only suffixes or en- + tire words may be replaced. Otherwise % is the substring of old_string to be replaced in new_string. If only old_string con- tains the pattern matching character %, and old_string matches, then the result is the new_string. If only the new_string contains the pattern matching character %, then it is not treated specially and it is printed as a literal % on match. If there is more than one pattern matching character (%) in either the new_string or old_string, only the first instance is treated specially (as the pattern character); all subsequent instances are treated as regular characters. Variable expansion occurs in the normal fashion inside both old_string and new_string with the single exception that a backslash is used to prevent the expansion of a dollar sign (`$'), not a pre- ceding dollar sign as is usual. :@temp@string@ This is the loop expansion mechanism from the OSF Development Envi- ronment (ODE) make. Unlike .for loops, expansion occurs at the time of reference. Assigns temp to each word in the variable and evalu- ates string. The ODE convention is that temp should start and end with a period. For example. ${LINKS:@.LINK.@${LN} ${TARGET} ${.LINK.}@} However a single character variable is often more readable: ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@} :_[=var] Saves the current variable value in `$_' or the named var for later reference. Example usage: M_cmpv.units = 1 1000 1000000 M_cmpv = S,., ,g:_:range:@i@+ $${_:[-$$i]} \ \* $${M_cmpv.units:[$$i]}@:S,^,expr 0 ,1:sh .if ${VERSION:${M_cmpv}} < ${3.1.12:L:${M_cmpv}} Here `$_' is used to save the result of the `:S' modifier which is later referenced using the index values from `:range'. :Unewval If the variable is undefined, newval is the value. If the variable is defined, the existing value is returned. This is another ODE - make feature. It is handy for setting per-target CFLAGS for - instance: + make feature. It is handy for setting per-target CFLAGS for in- + stance: ${_${.TARGET:T}_CFLAGS:U${DEF_CFLAGS}} If a value is only required if the variable is undefined, use: ${VAR:D:Unewval} :Dnewval If the variable is defined, newval is the value. :L The name of the variable is the value. :P The path of the node which has the same name as the variable is the value. If no such node exists or its path is null, then the name of the variable is used. In order for this modifier to work, the name (node) must at least have appeared on the rhs of a dependency. :!cmd! The output of running cmd is the value. :sh If the variable is non-empty it is run as a command and the output becomes the new value. ::=str The variable is assigned the value str after substitution. This modifier and its variations are useful in obscure situations such as wanting to set a variable when shell commands are being parsed. These assignment modifiers always expand to nothing, so if appearing in a rule line by themselves should be preceded with something to keep bmake happy. The `::' helps avoid false matches with the AT&T System V UNIX style := modifier and since substitution always occurs the ::= form is vaguely appropriate. ::?=str As for ::= but only if the variable does not already have a value. ::+=str Append str to the variable. ::!=cmd Assign the output of cmd to the variable. :[range] Selects one or more words from the value, or performs other opera- tions related to the way in which the value is divided into words. Ordinarily, a value is treated as a sequence of words delimited by white space. Some modifiers suppress this behavior, causing a value to be treated as a single word (possibly containing embedded white space). An empty value, or a value that consists entirely of white- space, is treated as a single word. For the purposes of the `:[]' modifier, the words are indexed both forwards using positive inte- gers (where index 1 represents the first word), and backwards using negative integers (where index -1 represents the last word). - The range is subjected to variable expansion, and the expanded - result is then interpreted as follows: + The range is subjected to variable expansion, and the expanded re- + sult is then interpreted as follows: index Selects a single word from the value. start..end Selects all words from start to end, inclusive. For example, `:[2..-1]' selects all words from the second word to the last word. If start is greater than end, then the words are out- put in reverse order. For example, `:[-1..1]' selects all - the words from last to first. If the list is already - ordered, then this effectively reverses the list, but it is + the words from last to first. If the list is already or- + dered, then this effectively reverses the list, but it is more efficient to use `:Or' instead of `:O:[-1..1]'. * Causes subsequent modifiers to treat the value as a single word (possibly containing embedded white space). Analogous to the effect of "$*" in Bourne shell. 0 Means the same as `:[*]'. @ Causes subsequent modifiers to treat the value as a sequence of words delimited by white space. Analogous to the effect of "$@" in Bourne shell. # Returns the number of words in the value. INCLUDE STATEMENTS, CONDITIONALS AND FOR LOOPS Makefile inclusion, conditional structures and for loops reminiscent of the C programming language are provided in bmake. All such structures are identified by a line beginning with a single dot (`.') character. Files are included with either .include <file> or .include "file". Vari- ables between the angle brackets or double quotes are expanded to form - the file name. If angle brackets are used, the included makefile is - expected to be in the system makefile directory. If double quotes are + the file name. If angle brackets are used, the included makefile is ex- + pected to be in the system makefile directory. If double quotes are used, the including makefile's directory and any directories specified using the -I option are searched before the system makefile directory. For compatibility with other versions of bmake `include file ...' is also accepted. - If the include statement is written as .-include or as .sinclude then - errors locating and/or opening include files are ignored. + If the include statement is written as .-include or as .sinclude then er- + rors locating and/or opening include files are ignored. - If the include statement is written as .dinclude not only are errors - locating and/or opening include files ignored, but stale dependencies + If the include statement is written as .dinclude not only are errors lo- + cating and/or opening include files ignored, but stale dependencies within the included file will be ignored just like .MAKE.DEPENDFILE. Conditional expressions are also preceded by a single dot as the first character of a line. The possible conditionals are as follows: .error message The message is printed along with the name of the makefile and line number, then bmake will exit immediately. .export variable ... Export the specified global variable. If no variable list is provided, all globals are exported except for internal variables (those that start with `.'). This is not affected by the -X flag, so should be used with caution. For compatibility with other bmake programs `export variable=value' is also accepted. - Appending a variable name to .MAKE.EXPORTED is equivalent to - exporting a variable. + Appending a variable name to .MAKE.EXPORTED is equivalent to ex- + porting a variable. .export-env variable ... The same as `.export', except that the variable is not appended to .MAKE.EXPORTED. This allows exporting a value to the environ- ment which is different from that used by bmake internally. .export-literal variable ... The same as `.export-env', except that variables in the value are not expanded. .info message The message is printed along with the name of the makefile and line number. - .undef variable - Un-define the specified global variable. Only global variables - may be un-defined. + .undef variable ... + Un-define the specified global variables. Only global variables + can be un-defined. .unexport variable ... The opposite of `.export'. The specified global variable will be removed from .MAKE.EXPORTED. If no variable list is provided, all globals are unexported, and .MAKE.EXPORTED deleted. .unexport-env Unexport all globals previously exported and clear the environ- ment inherited from the parent. This operation will cause a mem- ory leak of the original environment, so should be used spar- ingly. Testing for .MAKE.LEVEL being 0, would make sense. Also note that any variables which originated in the parent environ- ment should be explicitly preserved if desired. For example: .if ${.MAKE.LEVEL} == 0 PATH := ${PATH} .unexport-env .export PATH .endif Would result in an environment containing only `PATH', which is the minimal useful environment. Actually `.MAKE.LEVEL' will also be pushed into the new environment. .warning message The message prefixed by `warning:' is printed along with the name of the makefile and line number. .if [!]expression [operator expression ...] Test the value of an expression. .ifdef [!]variable [operator variable ...] Test the value of a variable. .ifndef [!]variable [operator variable ...] Test the value of a variable. .ifmake [!]target [operator target ...] Test the target being built. .ifnmake [!] target [operator target ...] Test the target being built. .else Reverse the sense of the last conditional. .elif [!] expression [operator expression ...] A combination of `.else' followed by `.if'. .elifdef [!]variable [operator variable ...] A combination of `.else' followed by `.ifdef'. .elifndef [!]variable [operator variable ...] A combination of `.else' followed by `.ifndef'. .elifmake [!]target [operator target ...] A combination of `.else' followed by `.ifmake'. .elifnmake [!]target [operator target ...] A combination of `.else' followed by `.ifnmake'. .endif End the body of the conditional. The operator may be any one of the following: || Logical OR. - && Logical AND; of higher precedence than ``||''. + && Logical AND; of higher precedence than "||". As in C, bmake will only evaluate a conditional as far as is necessary to determine its value. Parentheses may be used to change the order of evaluation. The boolean operator `!' may be used to logically negate an entire conditional. It is of higher precedence than `&&'. The value of expression may be any of the following: defined Takes a variable name as an argument and evaluates to true if the variable has been defined. make Takes a target name as an argument and evaluates to true if the - target was specified as part of bmake's command line or was - declared the default target (either implicitly or explicitly, - see .MAIN) before the line containing the conditional. + target was specified as part of bmake's command line or was de- + clared the default target (either implicitly or explicitly, see + .MAIN) before the line containing the conditional. empty Takes a variable, with possible modifiers, and evaluates to true if the expansion of the variable would result in an empty string. exists Takes a file name as an argument and evaluates to true if the file exists. The file is searched for on the system search path (see .PATH). target Takes a target name as an argument and evaluates to true if the target has been defined. commands Takes a target name as an argument and evaluates to true if the target has been defined and has commands associated with it. - Expression may also be an arithmetic or string comparison. Variable - expansion is performed on both sides of the comparison, after which the - numerical values are compared. A value is interpreted as hexadecimal if - it is preceded by 0x, otherwise it is decimal; octal numbers are not sup- + Expression may also be an arithmetic or string comparison. Variable ex- + pansion is performed on both sides of the comparison, after which the nu- + merical values are compared. A value is interpreted as hexadecimal if it + is preceded by 0x, otherwise it is decimal; octal numbers are not sup- ported. The standard C relational operators are all supported. If after variable expansion, either the left or right hand side of a `==' or `!=' operator is not a numerical value, then string comparison is performed between the expanded variables. If no relational operator is given, it is assumed that the expanded variable is being compared against 0, or an empty string in the case of a string comparison. - When bmake is evaluating one of these conditional expressions, and it - encounters a (white-space separated) word it doesn't recognize, either - the ``make'' or ``defined'' expression is applied to it, depending on the - form of the conditional. If the form is `.ifdef', `.ifndef', or `.if' - the ``defined'' expression is applied. Similarly, if the form is - `.ifmake' or `.ifnmake', the ``make'' expression is applied. + When bmake is evaluating one of these conditional expressions, and it en- + counters a (white-space separated) word it doesn't recognize, either the + "make" or "defined" expression is applied to it, depending on the form of + the conditional. If the form is `.ifdef', `.ifndef', or `.if' the + "defined" expression is applied. Similarly, if the form is `.ifmake' or + `.ifnmake', the "make" expression is applied. If the conditional evaluates to true the parsing of the makefile contin- ues as before. If it evaluates to false, the following lines are skipped. In both cases this continues until a `.else' or `.endif' is found. For loops are typically used to apply a set of rules to a list of files. The syntax of a for loop is: .for variable [variable ...] in expression .endfor After the for expression is evaluated, it is split into words. On each iteration of the loop, one word is taken and assigned to each variable, in order, and these variables are substituted into the make-lines inside the body of the for loop. The number of words must come out even; that is, if there are three iteration variables, the number of words provided must be a multiple of three. COMMENTS Comments begin with a hash (`#') character, anywhere but in a shell com- mand line, and continue to the end of an unescaped new line. SPECIAL SOURCES (ATTRIBUTES) .EXEC Target is never out of date, but always execute commands any- way. .IGNORE Ignore any errors from the commands associated with this tar- get, exactly as if they all were preceded by a dash (`-'). .MADE Mark all sources of this target as being up-to-date. .MAKE Execute the commands associated with this target even if the -n or -t options were specified. Normally used to mark recursive bmakes. .META Create a meta file for the target, even if it is flagged as .PHONY, .MAKE, or .SPECIAL. Usage in conjunction with .MAKE is the most likely case. In "meta" mode, the target is out-of- date if the meta file is missing. .NOMETA Do not create a meta file for the target. Meta files are also not created for .PHONY, .MAKE, or .SPECIAL targets. .NOMETA_CMP Ignore differences in commands when deciding if target is out of date. This is useful if the command contains a value which always changes. If the number of commands change, though, the target will still be out of date. The same effect applies to any command line that uses the variable .OODATE, which can be - used for that purpose even when not otherwise needed or - desired: + used for that purpose even when not otherwise needed or de- + sired: skip-compare-for-some: @echo this will be compared @echo this will not ${.OODATE:M.NOMETA_CMP} @echo this will also be compared The :M pattern suppresses any expansion of the unwanted vari- able. .NOPATH Do not search for the target in the directories specified by .PATH. .NOTMAIN Normally bmake selects the first target it encounters as the default target to be built if no target was specified. This source prevents this target from being selected. .OPTIONAL If a target is marked with this attribute and bmake can't fig- ure out how to create it, it will ignore this fact and assume the file isn't needed or already exists. .PHONY The target does not correspond to an actual file; it is always considered to be out of date, and will not be created with the -t option. Suffix-transformation rules are not applied to .PHONY targets. .PRECIOUS When bmake is interrupted, it normally removes any partially - made targets. This source prevents the target from being - removed. + made targets. This source prevents the target from being re- + moved. .RECURSIVE Synonym for .MAKE. .SILENT Do not echo any of the commands associated with this target, exactly as if they all were preceded by an at sign (`@'). .USE Turn the target into bmake's version of a macro. When the tar- get is used as a source for another target, the other target acquires the commands, sources, and attributes (except for .USE) of the source. If the target already has commands, the .USE target's commands are appended to them. .USEBEFORE Exactly like .USE, but prepend the .USEBEFORE target commands to the target. .WAIT If .WAIT appears in a dependency line, the sources that precede it are made before the sources that succeed it in the line. - Since the dependents of files are not made until the file - itself could be made, this also stops the dependents being - built unless they are needed for another branch of the depen- - dency tree. So given: + Since the dependents of files are not made until the file it- + self could be made, this also stops the dependents being built + unless they are needed for another branch of the dependency + tree. So given: x: a .WAIT b echo x a: echo a b: b1 echo b b1: echo b1 the output is always `a', `b1', `b', `x'. The ordering imposed by .WAIT is only relevant for parallel makes. SPECIAL TARGETS Special targets may not be included with other targets, i.e. they must be the only target specified. .BEGIN Any command lines attached to this target are executed before anything else is done. .DEFAULT This is sort of a .USE rule for any target (that was used only as a source) that bmake can't figure out any other way to cre- ate. Only the shell script is used. The .IMPSRC variable of a target that inherits .DEFAULT's commands is set to the target's own name. .DELETE_ON_ERROR If this target is present in the makefile, it globally causes make to delete targets whose commands fail. (By default, only targets whose commands are interrupted during execution are deleted. This is the historical behavior.) This setting can be - used to help prevent half-finished or malformed targets from - being left around and corrupting future rebuilds. + used to help prevent half-finished or malformed targets from be- + ing left around and corrupting future rebuilds. - .END Any command lines attached to this target are executed after - everything else is done. + .END Any command lines attached to this target are executed after ev- + erything else is done. - .ERROR Any command lines attached to this target are executed when - another target fails. The .ERROR_TARGET variable is set to the + .ERROR Any command lines attached to this target are executed when an- + other target fails. The .ERROR_TARGET variable is set to the target that failed. See also MAKE_PRINT_VAR_ON_ERROR. .IGNORE Mark each of the sources with the .IGNORE attribute. If no sources are specified, this is the equivalent of specifying the -i option. .INTERRUPT If bmake is interrupted, the commands for this target will be executed. .MAIN If no target is specified when bmake is invoked, this target will be built. .MAKEFLAGS This target provides a way to specify flags for bmake when the makefile is used. The flags are as if typed to the shell, though the -f option will have no effect. .NOPATH Apply the .NOPATH attribute to any specified sources. .NOTPARALLEL Disable parallel mode. .NO_PARALLEL Synonym for .NOTPARALLEL, for compatibility with other pmake variants. .OBJDIR The source is a new value for `.OBJDIR'. If it exists, bmake will chdir(2) to it and update the value of `.OBJDIR'. .ORDER The named targets are made in sequence. This ordering does not add targets to the list of targets to be made. Since the depen- dents of a target do not get built until the target itself could be built, unless `a' is built by another part of the dependency graph, the following is a dependency loop: .ORDER: b a b: a The ordering imposed by .ORDER is only relevant for parallel makes. .PATH The sources are directories which are to be searched for files not found in the current directory. If no sources are speci- fied, any previously specified directories are deleted. If the source is the special .DOTLAST target, then the current working directory is searched last. .PATH.suffix Like .PATH but applies only to files with a particular suffix. The suffix must have been previously declared with .SUFFIXES. .PHONY Apply the .PHONY attribute to any specified sources. .PRECIOUS Apply the .PRECIOUS attribute to any specified sources. If no - sources are specified, the .PRECIOUS attribute is applied to - every target in the file. + sources are specified, the .PRECIOUS attribute is applied to ev- + ery target in the file. .SHELL Sets the shell that bmake will use to execute commands. The sources are a set of field=value pairs. name This is the minimal specification, used to select one of the built-in shell specs; sh, ksh, and csh. path Specifies the path to the shell. hasErrCtl Indicates whether the shell supports exit on error. check The command to turn on error checking. ignore The command to disable error checking. echo The command to turn on echoing of commands executed. quiet The command to turn off echoing of commands exe- cuted. filter The output to filter after issuing the quiet com- mand. It is typically identical to quiet. errFlag The flag to pass the shell to enable error checking. echoFlag The flag to pass the shell to enable command echo- ing. newline The string literal to pass the shell that results in a single newline character when used outside of any quoting characters. Example: .SHELL: name=ksh path=/bin/ksh hasErrCtl=true \ check="set -e" ignore="set +e" \ echo="set -v" quiet="set +v" filter="set +v" \ echoFlag=v errFlag=e newline="'\n'" .SILENT Apply the .SILENT attribute to any specified sources. If no sources are specified, the .SILENT attribute is applied to every command in the file. - .STALE This target gets run when a dependency file contains stale - entries, having .ALLSRC set to the name of that dependency file. + .STALE This target gets run when a dependency file contains stale en- + tries, having .ALLSRC set to the name of that dependency file. .SUFFIXES Each source specifies a suffix to bmake. If no sources are specified, any previously specified suffixes are deleted. It allows the creation of suffix-transformation rules. Example: .SUFFIXES: .o .c.o: cc -o ${.TARGET} -c ${.IMPSRC} ENVIRONMENT bmake uses the following environment variables, if they exist: MACHINE, MACHINE_ARCH, MAKE, MAKEFLAGS, MAKEOBJDIR, MAKEOBJDIRPREFIX, MAKESYSPATH, PWD, and TMPDIR. MAKEOBJDIRPREFIX and MAKEOBJDIR may only be set in the environment or on the command line to bmake and not as makefile variables; see the descrip- tion of `.OBJDIR' for more details. FILES .depend list of dependencies Makefile list of dependencies makefile list of dependencies sys.mk system makefile /usr/share/mk system makefile directory COMPATIBILITY The basic make syntax is compatible between different versions of make; however the special variables, variable modifiers and conditionals are not. Older versions An incomplete list of changes in older versions of bmake: The way that .for loop variables are substituted changed after NetBSD 5.0 so that they still appear to be variable expansions. In particular this - stops them being treated as syntax, and removes some obscure problems - using them in .if statements. + stops them being treated as syntax, and removes some obscure problems us- + ing them in .if statements. The way that parallel makes are scheduled changed in NetBSD 4.0 so that .ORDER and .WAIT apply recursively to the dependent nodes. The algo- rithms used may change again in the future. Other make dialects Other make dialects (GNU make, SVR4 make, POSIX make, etc.) do not sup- - port most of the features of bmake as described in this manual. Most - notably: + port most of the features of bmake as described in this manual. Most no- + tably: +o The .WAIT and .ORDER declarations and most functionality per- taining to parallelization. (GNU make supports parallelization but lacks these features needed to control it effectively.) +o Directives, including for loops and conditionals and most of the forms of include files. (GNU make has its own incompatible and less powerful syntax for conditionals.) +o All built-in variables that begin with a dot. +o Most of the special sources and targets that begin with a dot, with the notable exception of .PHONY, .PRECIOUS, and .SUFFIXES. +o Variable modifiers, except for the :old=new string substitution, which does not portably support globbing with `%' and historically only works on declared suffixes. +o The $> variable even in its short form; most makes support this functionality but its name varies. Some features are somewhat more portable, such as assignment with +=, ?=, and !=. The .PATH functionality is based on an older feature VPATH found - in GNU make and many versions of SVR4 make; however, historically its - behavior is too ill-defined (and too buggy) to rely upon. + in GNU make and many versions of SVR4 make; however, historically its be- + havior is too ill-defined (and too buggy) to rely upon. The $@ and $< variables are more or less universally portable, as is the $(MAKE) variable. Basic use of suffix rules (for files only in the cur- rent directory, not trying to chain transformations together, etc.) is also reasonably portable. SEE ALSO mkdep(1) HISTORY bmake is derived from NetBSD make(1). It uses autoconf to facilitate portability to other platforms. A make command appeared in Version 7 AT&T UNIX. This make implementation is based on Adam De Boor's pmake program which was written for Sprite at Berkeley. It was designed to be a parallel distributed make running jobs - on different machines using a daemon called ``customs''. + on different machines using a daemon called "customs". - Historically the target/dependency ``FRC'' has been used to FoRCe - rebuilding (since the target/dependency does not exist... unless someone - creates an ``FRC'' file). + Historically the target/dependency "FRC" has been used to FoRCe rebuild- + ing (since the target/dependency does not exist... unless someone creates + an "FRC" file). BUGS The make syntax is difficult to parse without actually acting on the data. For instance, finding the end of a variable's use should involve scanning each of the modifiers, using the correct terminator for each field. In many places make just counts {} and () in order to find the end of a variable expansion. There is no way of escaping a space character in a filename. -FreeBSD 11.3 November 14, 2020 FreeBSD 11.3 +FreeBSD 13.0 December 22, 2020 FreeBSD 13.0 diff --git a/buf.c b/buf.c index 6cbf31a2bd60..b6a2e9192b60 100644 --- a/buf.c +++ b/buf.c @@ -1,214 +1,221 @@ -/* $NetBSD: buf.c,v 1.44 2020/11/07 14:11:58 rillig Exp $ */ +/* $NetBSD: buf.c,v 1.47 2020/12/30 10:03:16 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* Automatically-expanding null-terminated buffers. */ +/* Automatically-expanding null-terminated character buffers. */ #include #include "make.h" /* "@(#)buf.c 8.1 (Berkeley) 6/6/93" */ -MAKE_RCSID("$NetBSD: buf.c,v 1.44 2020/11/07 14:11:58 rillig Exp $"); +MAKE_RCSID("$NetBSD: buf.c,v 1.47 2020/12/30 10:03:16 rillig Exp $"); -/* Make space in the buffer for adding a single byte. */ +/* Make space in the buffer for adding at least 16 more bytes. */ void -Buf_Expand_1(Buffer *buf) +Buf_Expand(Buffer *buf) { - buf->cap += buf->cap > 16 ? buf->cap : 16; - buf->data = bmake_realloc(buf->data, buf->cap); + buf->cap += buf->cap > 16 ? buf->cap : 16; + buf->data = bmake_realloc(buf->data, buf->cap); } /* Add the bytes to the buffer. */ void Buf_AddBytes(Buffer *buf, const char *bytes, size_t bytes_len) { - size_t old_len = buf->len; - char *end; - - if (__predict_false(old_len + bytes_len >= buf->cap)) { - buf->cap += buf->cap > bytes_len + 16 ? buf->cap : bytes_len + 16; - buf->data = bmake_realloc(buf->data, buf->cap); - } - - end = buf->data + old_len; - buf->len = old_len + bytes_len; - memcpy(end, bytes, bytes_len); - end[bytes_len] = '\0'; + size_t old_len = buf->len; + char *end; + + if (__predict_false(old_len + bytes_len >= buf->cap)) { + size_t minIncr = bytes_len + 16; + buf->cap += buf->cap > minIncr ? buf->cap : minIncr; + buf->data = bmake_realloc(buf->data, buf->cap); + } + + end = buf->data + old_len; + buf->len = old_len + bytes_len; + memcpy(end, bytes, bytes_len); + end[bytes_len] = '\0'; } /* Add the bytes between start and end to the buffer. */ void Buf_AddBytesBetween(Buffer *buf, const char *start, const char *end) { - Buf_AddBytes(buf, start, (size_t)(end - start)); + Buf_AddBytes(buf, start, (size_t)(end - start)); } /* Add the string to the buffer. */ void Buf_AddStr(Buffer *buf, const char *str) { - Buf_AddBytes(buf, str, strlen(str)); + Buf_AddBytes(buf, str, strlen(str)); } /* Add the number to the buffer. */ void Buf_AddInt(Buffer *buf, int n) { - enum { - bits = sizeof(int) * CHAR_BIT, - max_octal_digits = (bits + 2) / 3, - max_decimal_digits = /* at most */ max_octal_digits, - max_sign_chars = 1, - str_size = max_sign_chars + max_decimal_digits + 1 - }; - char str[str_size]; - - size_t len = (size_t)snprintf(str, sizeof str, "%d", n); - Buf_AddBytes(buf, str, len); + enum { + bits = sizeof(int) * CHAR_BIT, + max_octal_digits = (bits + 2) / 3, + max_decimal_digits = /* at most */ max_octal_digits, + max_sign_chars = 1, + str_size = max_sign_chars + max_decimal_digits + 1 + }; + char str[str_size]; + + size_t len = (size_t)snprintf(str, sizeof str, "%d", n); + Buf_AddBytes(buf, str, len); } -/* Get the data (usually a string) from the buffer. +/* + * Get the data (usually a string) from the buffer. * The returned data is valid until the next modifying operation * on the buffer. * - * Returns the data and optionally the length of the data. */ + * Returns the data and optionally the length of the data. + */ char * Buf_GetAll(Buffer *buf, size_t *out_len) { - if (out_len != NULL) - *out_len = buf->len; - return buf->data; + if (out_len != NULL) + *out_len = buf->len; + return buf->data; } /* Mark the buffer as empty, so it can be filled with data again. */ void Buf_Empty(Buffer *buf) { - buf->len = 0; - buf->data[0] = '\0'; + buf->len = 0; + buf->data[0] = '\0'; } /* Initialize a buffer. */ void Buf_InitSize(Buffer *buf, size_t cap) { - buf->cap = cap; - buf->len = 0; - buf->data = bmake_malloc(cap); - buf->data[0] = '\0'; + buf->cap = cap; + buf->len = 0; + buf->data = bmake_malloc(cap); + buf->data[0] = '\0'; } void Buf_Init(Buffer *buf) { - Buf_InitSize(buf, 256); + Buf_InitSize(buf, 256); } -/* Reset the buffer. +/* + * Reset the buffer. * If freeData is TRUE, the data from the buffer is freed as well. - * Otherwise it is kept and returned. */ + * Otherwise it is kept and returned. + */ char * Buf_Destroy(Buffer *buf, Boolean freeData) { - char *data = buf->data; - if (freeData) { - free(data); - data = NULL; - } + char *data = buf->data; + if (freeData) { + free(data); + data = NULL; + } - buf->cap = 0; - buf->len = 0; - buf->data = NULL; + buf->cap = 0; + buf->len = 0; + buf->data = NULL; - return data; + return data; } #ifndef BUF_COMPACT_LIMIT -# define BUF_COMPACT_LIMIT 128 /* worthwhile saving */ +# define BUF_COMPACT_LIMIT 128 /* worthwhile saving */ #endif -/* Reset the buffer and return its data. +/* + * Reset the buffer and return its data. * * If the buffer size is much greater than its content, - * a new buffer will be allocated and the old one freed. */ + * a new buffer will be allocated and the old one freed. + */ char * Buf_DestroyCompact(Buffer *buf) { #if BUF_COMPACT_LIMIT > 0 - if (buf->cap - buf->len >= BUF_COMPACT_LIMIT) { - /* We trust realloc to be smart */ - char *data = bmake_realloc(buf->data, buf->len + 1); - data[buf->len] = '\0'; /* XXX: unnecessary */ - Buf_Destroy(buf, FALSE); - return data; - } + if (buf->cap - buf->len >= BUF_COMPACT_LIMIT) { + /* We trust realloc to be smart */ + char *data = bmake_realloc(buf->data, buf->len + 1); + data[buf->len] = '\0'; /* XXX: unnecessary */ + Buf_Destroy(buf, FALSE); + return data; + } #endif - return Buf_Destroy(buf, FALSE); + return Buf_Destroy(buf, FALSE); } diff --git a/buf.h b/buf.h index 6ab3d3288a43..942b115c76e6 100644 --- a/buf.h +++ b/buf.h @@ -1,132 +1,132 @@ -/* $NetBSD: buf.h,v 1.36 2020/11/10 00:32:12 rillig Exp $ */ +/* $NetBSD: buf.h,v 1.38 2020/12/28 15:42:53 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)buf.h 8.1 (Berkeley) 6/6/93 */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)buf.h 8.1 (Berkeley) 6/6/93 */ /* Automatically growing null-terminated buffers of characters. */ #ifndef MAKE_BUF_H #define MAKE_BUF_H #include /* An automatically growing null-terminated buffer of characters. */ typedef struct Buffer { - size_t cap; /* Allocated size of the buffer, including the null */ - size_t len; /* Number of bytes in buffer, excluding the null */ - char *data; /* The buffer itself (always null-terminated) */ + size_t cap; /* Allocated size of the buffer, including the null */ + size_t len; /* Number of bytes in buffer, excluding the null */ + char *data; /* The buffer itself (always null-terminated) */ } Buffer; /* If we aren't on NetBSD, __predict_false() might not be defined. */ #ifndef __predict_false #define __predict_false(x) (x) #endif -void Buf_Expand_1(Buffer *); +void Buf_Expand(Buffer *); /* Buf_AddByte adds a single byte to a buffer. */ MAKE_INLINE void Buf_AddByte(Buffer *buf, char byte) { - size_t old_len = buf->len++; - char *end; - if (__predict_false(old_len + 1 >= buf->cap)) - Buf_Expand_1(buf); - end = buf->data + old_len; - end[0] = byte; - end[1] = '\0'; + size_t old_len = buf->len++; + char *end; + if (__predict_false(old_len + 1 >= buf->cap)) + Buf_Expand(buf); + end = buf->data + old_len; + end[0] = byte; + end[1] = '\0'; } MAKE_INLINE size_t Buf_Len(const Buffer *buf) { - return buf->len; + return buf->len; } MAKE_INLINE Boolean Buf_EndsWith(const Buffer *buf, char ch) { - return buf->len > 0 && buf->data[buf->len - 1] == ch; + return buf->len > 0 && buf->data[buf->len - 1] == ch; } void Buf_AddBytes(Buffer *, const char *, size_t); void Buf_AddBytesBetween(Buffer *, const char *, const char *); void Buf_AddStr(Buffer *, const char *); void Buf_AddInt(Buffer *, int); char *Buf_GetAll(Buffer *, size_t *); void Buf_Empty(Buffer *); void Buf_Init(Buffer *); void Buf_InitSize(Buffer *, size_t); char *Buf_Destroy(Buffer *, Boolean); char *Buf_DestroyCompact(Buffer *); #endif /* MAKE_BUF_H */ diff --git a/compat.c b/compat.c index 2307e9f2d935..6c7238318959 100644 --- a/compat.c +++ b/compat.c @@ -1,698 +1,758 @@ -/* $NetBSD: compat.c,v 1.183 2020/11/15 22:31:03 rillig Exp $ */ +/* $NetBSD: compat.c,v 1.219 2021/01/10 21:20:46 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /*- * compat.c -- * The routines in this file implement the full-compatibility * mode of PMake. Most of the special functionality of PMake * is available in this mode. Things not supported: * - different shells. * - friendly variable substitution. * * Interface: * Compat_Run Initialize things for this module and recreate * thems as need creatin' */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include #include #include "wait.h" #include #include #include "make.h" #include "dir.h" #include "job.h" #include "metachar.h" #include "pathnames.h" /* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: compat.c,v 1.183 2020/11/15 22:31:03 rillig Exp $"); +MAKE_RCSID("$NetBSD: compat.c,v 1.219 2021/01/10 21:20:46 rillig Exp $"); static GNode *curTarg = NULL; static pid_t compatChild; static int compatSigno; /* * CompatDeleteTarget -- delete the file of a failed, interrupted, or * otherwise duffed target if not inhibited by .PRECIOUS. */ static void CompatDeleteTarget(GNode *gn) { - if (gn != NULL && !Targ_Precious(gn)) { - const char *file = GNode_VarTarget(gn); + if (gn != NULL && !Targ_Precious(gn)) { + const char *file = GNode_VarTarget(gn); - if (!opts.noExecute && eunlink(file) != -1) { - Error("*** %s removed", file); + if (!opts.noExecute && eunlink(file) != -1) { + Error("*** %s removed", file); + } } - } } -/* Interrupt the creation of the current target and remove it if it ain't +/* + * Interrupt the creation of the current target and remove it if it ain't * precious. Then exit. * * If .INTERRUPT exists, its commands are run first WITH INTERRUPTS IGNORED. * * XXX: is .PRECIOUS supposed to inhibit .INTERRUPT? I doubt it, but I've * left the logic alone for now. - dholland 20160826 */ static void CompatInterrupt(int signo) { - CompatDeleteTarget(curTarg); + CompatDeleteTarget(curTarg); + + if (curTarg != NULL && !Targ_Precious(curTarg)) { + /* + * Run .INTERRUPT only if hit with interrupt signal + */ + if (signo == SIGINT) { + GNode *gn = Targ_FindNode(".INTERRUPT"); + if (gn != NULL) { + Compat_Make(gn, gn); + } + } + } + + if (signo == SIGQUIT) + _exit(signo); - if (curTarg != NULL && !Targ_Precious(curTarg)) { /* - * Run .INTERRUPT only if hit with interrupt signal + * If there is a child running, pass the signal on. + * We will exist after it has exited. */ - if (signo == SIGINT) { - GNode *gn = Targ_FindNode(".INTERRUPT"); - if (gn != NULL) { - Compat_Make(gn, gn); - } - } - } - - if (signo == SIGQUIT) - _exit(signo); - - /* - * If there is a child running, pass the signal on. - * We will exist after it has exited. - */ - compatSigno = signo; - if (compatChild > 0) { - KILLPG(compatChild, signo); - } else { - bmake_signal(signo, SIG_DFL); - kill(myPid, signo); - } + compatSigno = signo; + if (compatChild > 0) { + KILLPG(compatChild, signo); + } else { + bmake_signal(signo, SIG_DFL); + kill(myPid, signo); + } +} + +static void +DebugFailedTarget(const char *cmd, GNode *gn) +{ + const char *p = cmd; + debug_printf("\n*** Failed target: %s\n*** Failed command: ", + gn->name); + + /* Replace runs of whitespace with a single space, to reduce + * the amount of whitespace for multi-line command lines. */ + while (*p != '\0') { + if (ch_isspace(*p)) { + debug_printf(" "); + cpp_skip_whitespace(&p); + } else { + debug_printf("%c", *p); + p++; + } + } + debug_printf("\n"); } -/* Execute the next command for a target. If the command returns an error, +static Boolean +UseShell(const char *cmd MAKE_ATTR_UNUSED) +{ +#if !defined(MAKE_NATIVE) + /* + * In a non-native build, the host environment might be weird enough + * that it's necessary to go through a shell to get the correct + * behaviour. Or perhaps the shell has been replaced with something + * that does extra logging, and that should not be bypassed. + */ + return TRUE; +#else + /* + * Search for meta characters in the command. If there are no meta + * characters, there's no need to execute a shell to execute the + * command. + * + * Additionally variable assignments and empty commands + * go to the shell. Therefore treat '=' and ':' like shell + * meta characters as documented in make(1). + */ + + return needshell(cmd); +#endif +} + +/* + * Execute the next command for a target. If the command returns an error, * the node's made field is set to ERROR and creation stops. * * Input: * cmdp Command to execute - * gnp Node from which the command came + * gn Node from which the command came + * ln List node that contains the command * * Results: * 0 if the command succeeded, 1 if an error occurred. */ int -Compat_RunCommand(const char *cmdp, GNode *gn) +Compat_RunCommand(const char *cmdp, GNode *gn, StringListNode *ln) { - char *cmdStart; /* Start of expanded command */ - char *bp; - Boolean silent; /* Don't print command */ - Boolean doIt; /* Execute even if -n */ - volatile Boolean errCheck; /* Check errors */ - WAIT_T reason; /* Reason for child's death */ - int status; /* Description of child's death */ - pid_t cpid; /* Child actually found */ - pid_t retstat; /* Result of wait */ - StringListNode *cmdNode; /* Node where current command is located */ - const char **volatile av; /* Argument vector for thing to exec */ - char **volatile mav; /* Copy of the argument vector for freeing */ - Boolean useShell; /* TRUE if command should be executed + char *cmdStart; /* Start of expanded command */ + char *bp; + Boolean silent; /* Don't print command */ + Boolean doIt; /* Execute even if -n */ + volatile Boolean errCheck; /* Check errors */ + WAIT_T reason; /* Reason for child's death */ + WAIT_T status; /* Description of child's death */ + pid_t cpid; /* Child actually found */ + pid_t retstat; /* Result of wait */ + const char **volatile av; /* Argument vector for thing to exec */ + char **volatile mav; /* Copy of the argument vector for freeing */ + Boolean useShell; /* TRUE if command should be executed * using a shell */ - const char *volatile cmd = cmdp; - - silent = (gn->type & OP_SILENT) != 0; - errCheck = !(gn->type & OP_IGNORE); - doIt = FALSE; - - /* Luckily the commands don't end up in a string pool, otherwise - * this comparison could match too early, in a dependency using "..." - * for delayed commands, run in parallel mode, using the same shell - * command line more than once; see JobPrintCommand. - * TODO: write a unit-test to protect against this potential bug. */ - cmdNode = Lst_FindDatum(gn->commands, cmd); - (void)Var_Subst(cmd, gn, VARE_WANTRES, &cmdStart); - /* TODO: handle errors */ - - if (cmdStart[0] == '\0') { - free(cmdStart); - return 0; - } - cmd = cmdStart; - LstNode_Set(cmdNode, cmdStart); - - if (gn->type & OP_SAVE_CMDS) { - GNode *endNode = Targ_GetEndNode(); - if (gn != endNode) { - Lst_Append(endNode->commands, cmdStart); - return 0; - } - } - if (strcmp(cmdStart, "...") == 0) { - gn->type |= OP_SAVE_CMDS; - return 0; - } - - for (;;) { - if (*cmd == '@') - silent = !DEBUG(LOUD); - else if (*cmd == '-') - errCheck = FALSE; - else if (*cmd == '+') { - doIt = TRUE; - if (!shellName) /* we came here from jobs */ - Shell_Init(); - } else - break; - cmd++; - } + const char *volatile cmd = cmdp; - while (ch_isspace(*cmd)) - cmd++; + silent = (gn->type & OP_SILENT) != 0; + errCheck = !(gn->type & OP_IGNORE); + doIt = FALSE; - /* - * If we did not end up with a command, just skip it. - */ - if (cmd[0] == '\0') - return 0; + (void)Var_Subst(cmd, gn, VARE_WANTRES, &cmdStart); + /* TODO: handle errors */ -#if !defined(MAKE_NATIVE) - /* - * In a non-native build, the host environment might be weird enough - * that it's necessary to go through a shell to get the correct - * behaviour. Or perhaps the shell has been replaced with something - * that does extra logging, and that should not be bypassed. - */ - useShell = TRUE; -#else - /* - * Search for meta characters in the command. If there are no meta - * characters, there's no need to execute a shell to execute the - * command. - * - * Additionally variable assignments and empty commands - * go to the shell. Therefore treat '=' and ':' like shell - * meta characters as documented in make(1). - */ - - useShell = needshell(cmd); -#endif + if (cmdStart[0] == '\0') { + free(cmdStart); + return 0; + } + cmd = cmdStart; + LstNode_Set(ln, cmdStart); + + if (gn->type & OP_SAVE_CMDS) { + GNode *endNode = Targ_GetEndNode(); + if (gn != endNode) { + /* + * Append the expanded command, to prevent the + * local variables from being interpreted in the + * context of the .END node. + * + * A probably unintended side effect of this is that + * the expanded command will be expanded again in the + * .END node. Therefore, a literal '$' in these + * commands must be written as '$$$$' instead of the + * usual '$$'. + */ + Lst_Append(&endNode->commands, cmdStart); + return 0; + } + } + if (strcmp(cmdStart, "...") == 0) { + gn->type |= OP_SAVE_CMDS; + return 0; + } + + for (;;) { + if (*cmd == '@') + silent = !DEBUG(LOUD); + else if (*cmd == '-') + errCheck = FALSE; + else if (*cmd == '+') { + doIt = TRUE; + if (shellName == NULL) /* we came here from jobs */ + Shell_Init(); + } else + break; + cmd++; + } + + while (ch_isspace(*cmd)) + cmd++; - /* - * Print the command before echoing if we're not supposed to be quiet for - * this one. We also print the command if -n given. - */ - if (!silent || !GNode_ShouldExecute(gn)) { - printf("%s\n", cmd); - fflush(stdout); - } - - /* - * If we're not supposed to execute any commands, this is as far as - * we go... - */ - if (!doIt && !GNode_ShouldExecute(gn)) - return 0; - - DEBUG1(JOB, "Execute: '%s'\n", cmd); - - if (useShell) { /* - * We need to pass the command off to the shell, typically - * because the command contains a "meta" character. + * If we did not end up with a command, just skip it. */ - static const char *shargv[5]; - - /* The following work for any of the builtin shell specs. */ - int shargc = 0; - shargv[shargc++] = shellPath; - if (errCheck && shellErrFlag) - shargv[shargc++] = shellErrFlag; - shargv[shargc++] = DEBUG(SHELL) ? "-xc" : "-c"; - shargv[shargc++] = cmd; - shargv[shargc] = NULL; - av = shargv; - bp = NULL; - mav = NULL; - } else { + if (cmd[0] == '\0') + return 0; + + useShell = UseShell(cmd); /* - * No meta-characters, so no need to exec a shell. Break the command - * into words to form an argument vector we can execute. + * Print the command before echoing if we're not supposed to be quiet + * for this one. We also print the command if -n given. */ - Words words = Str_Words(cmd, FALSE); - mav = words.words; - bp = words.freeIt; - av = (void *)mav; - } + if (!silent || !GNode_ShouldExecute(gn)) { + printf("%s\n", cmd); + fflush(stdout); + } -#ifdef USE_META - if (useMeta) { - meta_compat_start(); - } -#endif + /* + * If we're not supposed to execute any commands, this is as far as + * we go... + */ + if (!doIt && !GNode_ShouldExecute(gn)) + return 0; + + DEBUG1(JOB, "Execute: '%s'\n", cmd); + + if (useShell) { + /* + * We need to pass the command off to the shell, typically + * because the command contains a "meta" character. + */ + static const char *shargv[5]; + + /* The following work for any of the builtin shell specs. */ + int shargc = 0; + shargv[shargc++] = shellPath; + if (errCheck && shellErrFlag != NULL) + shargv[shargc++] = shellErrFlag; + shargv[shargc++] = DEBUG(SHELL) ? "-xc" : "-c"; + shargv[shargc++] = cmd; + shargv[shargc] = NULL; + av = shargv; + bp = NULL; + mav = NULL; + } else { + /* + * No meta-characters, so no need to exec a shell. Break the + * command into words to form an argument vector we can + * execute. + */ + Words words = Str_Words(cmd, FALSE); + mav = words.words; + bp = words.freeIt; + av = (void *)mav; + } - /* - * Fork and execute the single command. If the fork fails, we abort. - */ - compatChild = cpid = vFork(); - if (cpid < 0) { - Fatal("Could not fork"); - } - if (cpid == 0) { - Var_ExportVars(); #ifdef USE_META if (useMeta) { - meta_compat_child(); + meta_compat_start(); } #endif - (void)execvp(av[0], (char *const *)UNCONST(av)); - execDie("exec", av[0]); - } - free(mav); - free(bp); + Var_ReexportVars(); - /* XXX: Memory management looks suspicious here. */ - /* XXX: Setting a list item to NULL is unexpected. */ - LstNode_SetNull(cmdNode); + /* + * Fork and execute the single command. If the fork fails, we abort. + */ + compatChild = cpid = vFork(); + if (cpid < 0) { + Fatal("Could not fork"); + } + if (cpid == 0) { +#ifdef USE_META + if (useMeta) { + meta_compat_child(); + } +#endif + (void)execvp(av[0], (char *const *)UNCONST(av)); + execDie("exec", av[0]); + } + + free(mav); + free(bp); + + /* XXX: Memory management looks suspicious here. */ + /* XXX: Setting a list item to NULL is unexpected. */ + LstNode_SetNull(ln); #ifdef USE_META - if (useMeta) { - meta_compat_parent(cpid); - } + if (useMeta) { + meta_compat_parent(cpid); + } #endif - /* - * The child is off and running. Now all we can do is wait... - */ - while ((retstat = wait(&reason)) != cpid) { - if (retstat > 0) - JobReapChild(retstat, reason, FALSE); /* not ours? */ - if (retstat == -1 && errno != EINTR) { - break; + /* + * The child is off and running. Now all we can do is wait... + */ + while ((retstat = wait(&reason)) != cpid) { + if (retstat > 0) + JobReapChild(retstat, reason, FALSE); /* not ours? */ + if (retstat == -1 && errno != EINTR) { + break; + } } - } - if (retstat < 0) - Fatal("error in wait: %d: %s", retstat, strerror(errno)); + if (retstat < 0) + Fatal("error in wait: %d: %s", retstat, strerror(errno)); - if (WIFSTOPPED(reason)) { - status = WSTOPSIG(reason); /* stopped */ - } else if (WIFEXITED(reason)) { - status = WEXITSTATUS(reason); /* exited */ + if (WIFSTOPPED(reason)) { + status = WSTOPSIG(reason); /* stopped */ + } else if (WIFEXITED(reason)) { + status = WEXITSTATUS(reason); /* exited */ #if defined(USE_META) && defined(USE_FILEMON_ONCE) - if (useMeta) { - meta_cmd_finish(NULL); - } + if (useMeta) { + meta_cmd_finish(NULL); + } #endif - if (status != 0) { - if (DEBUG(ERROR)) { - const char *p = cmd; - debug_printf("\n*** Failed target: %s\n*** Failed command: ", - gn->name); - - /* Replace runs of whitespace with a single space, to reduce - * the amount of whitespace for multi-line command lines. */ - while (*p != '\0') { - if (ch_isspace(*p)) { - debug_printf(" "); - cpp_skip_whitespace(&p); - } else { - debug_printf("%c", *p); - p++; - } + if (status != 0) { + if (DEBUG(ERROR)) + DebugFailedTarget(cmd, gn); + printf("*** Error code %d", status); } - debug_printf("\n"); - } - printf("*** Error code %d", status); + } else { + status = WTERMSIG(reason); /* signaled */ + printf("*** Signal %d", status); } - } else { - status = WTERMSIG(reason); /* signaled */ - printf("*** Signal %d", status); - } - if (!WIFEXITED(reason) || status != 0) { - if (errCheck) { + if (!WIFEXITED(reason) || status != 0) { + if (errCheck) { #ifdef USE_META - if (useMeta) { - meta_job_error(NULL, gn, 0, status); - } + if (useMeta) { + meta_job_error(NULL, gn, FALSE, status); + } #endif - gn->made = ERROR; - if (opts.keepgoing) { - /* Abort the current target, but let others continue. */ - printf(" (continuing)\n"); - } else { - printf("\n"); - } - if (deleteOnError) - CompatDeleteTarget(gn); - } else { - /* - * Continue executing commands for this target. - * If we return 0, this will happen... - */ - printf(" (ignored)\n"); - status = 0; - } - } - - free(cmdStart); - compatChild = 0; - if (compatSigno) { - bmake_signal(compatSigno, SIG_DFL); - kill(myPid, compatSigno); - } - - return status; + gn->made = ERROR; + if (opts.keepgoing) { + /* + * Abort the current target, + * but let others continue. + */ + printf(" (continuing)\n"); + } else { + printf("\n"); + } + if (deleteOnError) + CompatDeleteTarget(gn); + } else { + /* + * Continue executing commands for this target. + * If we return 0, this will happen... + */ + printf(" (ignored)\n"); + status = 0; + } + } + + free(cmdStart); + compatChild = 0; + if (compatSigno != 0) { + bmake_signal(compatSigno, SIG_DFL); + kill(myPid, compatSigno); + } + + return status; } static void RunCommands(GNode *gn) { - StringListNode *ln; - for (ln = gn->commands->first; ln != NULL; ln = ln->next) { - const char *cmd = ln->datum; - if (Compat_RunCommand(cmd, gn) != 0) - break; - } + StringListNode *ln; + + for (ln = gn->commands.first; ln != NULL; ln = ln->next) { + const char *cmd = ln->datum; + if (Compat_RunCommand(cmd, gn, ln) != 0) + break; + } } static void MakeNodes(GNodeList *gnodes, GNode *pgn) { - GNodeListNode *ln; - for (ln = gnodes->first; ln != NULL; ln = ln->next) { - GNode *cohort = ln->datum; - Compat_Make(cohort, pgn); - } + GNodeListNode *ln; + + for (ln = gnodes->first; ln != NULL; ln = ln->next) { + GNode *cohort = ln->datum; + Compat_Make(cohort, pgn); + } } -/* Make a target. - * - * If an error is detected and not being ignored, the process exits. - * - * Input: - * gn The node to make - * pgn Parent to abort if necessary - */ -void -Compat_Make(GNode *gn, GNode *pgn) +static Boolean +MakeUnmade(GNode *gn, GNode *pgn) { - if (shellName == NULL) /* we came here from jobs */ - Shell_Init(); - if (gn->made == UNMADE && (gn == pgn || !(pgn->type & OP_MADE))) { + assert(gn->made == UNMADE); + /* * First mark ourselves to be made, then apply whatever transformations * the suffix module thinks are necessary. Once that's done, we can * descend and make all our children. If any of them has an error * but the -k flag was given, our 'make' field will be set to FALSE * again. This is our signal to not attempt to do anything but abort * our parent as well. */ gn->flags |= REMAKE; gn->made = BEINGMADE; + if (!(gn->type & OP_MADE)) - Suff_FindDeps(gn); - MakeNodes(gn->children, gn); + Suff_FindDeps(gn); + + MakeNodes(&gn->children, gn); + if (!(gn->flags & REMAKE)) { - gn->made = ABORTED; - pgn->flags &= ~(unsigned)REMAKE; - goto cohorts; + gn->made = ABORTED; + pgn->flags &= ~(unsigned)REMAKE; + return FALSE; } - if (Lst_FindDatum(gn->implicitParents, pgn) != NULL) - Var_Set(IMPSRC, GNode_VarTarget(gn), pgn); + if (Lst_FindDatum(&gn->implicitParents, pgn) != NULL) + Var_Set(IMPSRC, GNode_VarTarget(gn), pgn); /* * All the children were made ok. Now youngestChild->mtime contains the * modification time of the newest child, we need to find out if we * exist and when we were modified last. The criteria for datedness * are defined by GNode_IsOODate. */ DEBUG1(MAKE, "Examining %s...", gn->name); if (!GNode_IsOODate(gn)) { - gn->made = UPTODATE; - DEBUG0(MAKE, "up-to-date.\n"); - goto cohorts; - } else - DEBUG0(MAKE, "out-of-date.\n"); + gn->made = UPTODATE; + DEBUG0(MAKE, "up-to-date.\n"); + return FALSE; + } /* * If the user is just seeing if something is out-of-date, exit now * to tell him/her "yes". */ + DEBUG0(MAKE, "out-of-date.\n"); if (opts.queryFlag) - exit(1); + exit(1); /* - * We need to be re-made. We also have to make sure we've got a $? - * variable. To be nice, we also define the $> variable using - * Make_DoAllVar(). + * We need to be re-made. + * Ensure that $? (.OODATE) and $> (.ALLSRC) are both set. */ Make_DoAllVar(gn); /* * Alter our type to tell if errors should be ignored or things - * should not be printed so CompatRunCommand knows what to do. + * should not be printed so Compat_RunCommand knows what to do. */ - if (Targ_Ignore(gn)) - gn->type |= OP_IGNORE; - if (Targ_Silent(gn)) - gn->type |= OP_SILENT; + if (opts.ignoreErrors) + gn->type |= OP_IGNORE; + if (opts.beSilent) + gn->type |= OP_SILENT; if (Job_CheckCommands(gn, Fatal)) { - /* - * Our commands are ok, but we still have to worry about the -t - * flag... - */ - if (!opts.touchFlag || (gn->type & OP_MAKE)) { - curTarg = gn; + /* + * Our commands are ok, but we still have to worry about + * the -t flag. + */ + if (!opts.touchFlag || (gn->type & OP_MAKE)) { + curTarg = gn; #ifdef USE_META - if (useMeta && GNode_ShouldExecute(gn)) { - meta_job_start(NULL, gn); - } + if (useMeta && GNode_ShouldExecute(gn)) { + meta_job_start(NULL, gn); + } #endif - RunCommands(gn); - curTarg = NULL; - } else { - Job_Touch(gn, (gn->type & OP_SILENT) != 0); - } + RunCommands(gn); + curTarg = NULL; + } else { + Job_Touch(gn, (gn->type & OP_SILENT) != 0); + } } else { - gn->made = ERROR; + gn->made = ERROR; } #ifdef USE_META if (useMeta && GNode_ShouldExecute(gn)) { - if (meta_job_finish(NULL) != 0) - gn->made = ERROR; + if (meta_job_finish(NULL) != 0) + gn->made = ERROR; } #endif if (gn->made != ERROR) { - /* - * If the node was made successfully, mark it so, update - * its modification time and timestamp all its parents. - * This is to keep its state from affecting that of its parent. - */ - gn->made = MADE; - if (Make_Recheck(gn) == 0) - pgn->flags |= FORCE; - if (!(gn->type & OP_EXEC)) { - pgn->flags |= CHILDMADE; - GNode_UpdateYoungestChild(pgn, gn); - } + /* + * If the node was made successfully, mark it so, update + * its modification time and timestamp all its parents. + * This is to keep its state from affecting that of its parent. + */ + gn->made = MADE; + if (Make_Recheck(gn) == 0) + pgn->flags |= FORCE; + if (!(gn->type & OP_EXEC)) { + pgn->flags |= CHILDMADE; + GNode_UpdateYoungestChild(pgn, gn); + } } else if (opts.keepgoing) { - pgn->flags &= ~(unsigned)REMAKE; + pgn->flags &= ~(unsigned)REMAKE; } else { - PrintOnError(gn, "\nStop."); - exit(1); - } - } else if (gn->made == ERROR) { - /* Already had an error when making this. Tell the parent to abort. */ - pgn->flags &= ~(unsigned)REMAKE; - } else { - if (Lst_FindDatum(gn->implicitParents, pgn) != NULL) { - const char *target = GNode_VarTarget(gn); - Var_Set(IMPSRC, target != NULL ? target : "", pgn); - } - switch(gn->made) { - case BEINGMADE: + PrintOnError(gn, "\nStop."); + exit(1); + } + return TRUE; +} + +static void +MakeOther(GNode *gn, GNode *pgn) +{ + + if (Lst_FindDatum(&gn->implicitParents, pgn) != NULL) { + const char *target = GNode_VarTarget(gn); + Var_Set(IMPSRC, target != NULL ? target : "", pgn); + } + + switch (gn->made) { + case BEINGMADE: Error("Graph cycles through %s", gn->name); gn->made = ERROR; pgn->flags &= ~(unsigned)REMAKE; break; - case MADE: + case MADE: if (!(gn->type & OP_EXEC)) { - pgn->flags |= CHILDMADE; - GNode_UpdateYoungestChild(pgn, gn); + pgn->flags |= CHILDMADE; + GNode_UpdateYoungestChild(pgn, gn); } break; - case UPTODATE: + case UPTODATE: if (!(gn->type & OP_EXEC)) - GNode_UpdateYoungestChild(pgn, gn); + GNode_UpdateYoungestChild(pgn, gn); break; - default: + default: break; } - } +} + +/* + * Make a target. + * + * If an error is detected and not being ignored, the process exits. + * + * Input: + * gn The node to make + * pgn Parent to abort if necessary + * + * Output: + * gn->made + * UPTODATE gn was already up-to-date. + * MADE gn was recreated successfully. + * ERROR An error occurred while gn was being created, + * either due to missing commands or in -k mode. + * ABORTED gn was not remade because one of its + * dependencies could not be made due to errors. + */ +void +Compat_Make(GNode *gn, GNode *pgn) +{ + if (shellName == NULL) /* we came here from jobs */ + Shell_Init(); + + if (gn->made == UNMADE && (gn == pgn || !(pgn->type & OP_MADE))) { + if (!MakeUnmade(gn, pgn)) + goto cohorts; + + /* XXX: Replace with GNode_IsError(gn) */ + } else if (gn->made == ERROR) { + /* + * Already had an error when making this. + * Tell the parent to abort. + */ + pgn->flags &= ~(unsigned)REMAKE; + } else { + MakeOther(gn, pgn); + } cohorts: - MakeNodes(gn->cohorts, pgn); + MakeNodes(&gn->cohorts, pgn); +} + +static void +MakeBeginNode(void) +{ + GNode *gn = Targ_FindNode(".BEGIN"); + if (gn == NULL) + return; + + Compat_Make(gn, gn); + if (GNode_IsError(gn)) { + PrintOnError(gn, "\nStop."); + exit(1); + } +} + +static void +InitSignals(void) +{ + if (bmake_signal(SIGINT, SIG_IGN) != SIG_IGN) + bmake_signal(SIGINT, CompatInterrupt); + if (bmake_signal(SIGTERM, SIG_IGN) != SIG_IGN) + bmake_signal(SIGTERM, CompatInterrupt); + if (bmake_signal(SIGHUP, SIG_IGN) != SIG_IGN) + bmake_signal(SIGHUP, CompatInterrupt); + if (bmake_signal(SIGQUIT, SIG_IGN) != SIG_IGN) + bmake_signal(SIGQUIT, CompatInterrupt); } -/* Initialize this module and start making. +/* + * Initialize this module and start making. * * Input: * targs The target nodes to re-create */ void Compat_Run(GNodeList *targs) { - GNode *gn = NULL; /* Current root target */ - int errors; /* Number of targets not remade due to errors */ - - if (!shellName) - Shell_Init(); - - if (bmake_signal(SIGINT, SIG_IGN) != SIG_IGN) - bmake_signal(SIGINT, CompatInterrupt); - if (bmake_signal(SIGTERM, SIG_IGN) != SIG_IGN) - bmake_signal(SIGTERM, CompatInterrupt); - if (bmake_signal(SIGHUP, SIG_IGN) != SIG_IGN) - bmake_signal(SIGHUP, CompatInterrupt); - if (bmake_signal(SIGQUIT, SIG_IGN) != SIG_IGN) - bmake_signal(SIGQUIT, CompatInterrupt); - - /* Create the .END node now, to keep the (debug) output of the - * counter.mk test the same as before 2020-09-23. This implementation - * detail probably doesn't matter though. */ - (void)Targ_GetEndNode(); - /* - * If the user has defined a .BEGIN target, execute the commands attached - * to it. - */ - if (!opts.queryFlag) { - gn = Targ_FindNode(".BEGIN"); - if (gn != NULL) { - Compat_Make(gn, gn); - if (gn->made == ERROR) { - PrintOnError(gn, "\nStop."); - exit(1); - } - } - } - - /* - * Expand .USE nodes right now, because they can modify the structure - * of the tree. - */ - Make_ExpandUse(targs); - - /* - * For each entry in the list of targets to create, call Compat_Make on - * it to create the thing. Compat_Make will leave the 'made' field of gn - * in one of several states: - * UPTODATE gn was already up-to-date - * MADE gn was recreated successfully - * ERROR An error occurred while gn was being created - * ABORTED gn was not remade because one of its inferiors - * could not be made due to errors. - */ - errors = 0; - while (!Lst_IsEmpty(targs)) { - gn = Lst_Dequeue(targs); - Compat_Make(gn, gn); + GNode *errorNode = NULL; + + if (shellName == NULL) + Shell_Init(); - if (gn->made == UPTODATE) { - printf("`%s' is up to date.\n", gn->name); - } else if (gn->made == ABORTED) { - printf("`%s' not remade because of errors.\n", gn->name); - errors++; - } - } - - /* - * If the user has defined a .END target, run its commands. - */ - if (errors == 0) { - GNode *endNode = Targ_GetEndNode(); - Compat_Make(endNode, endNode); - /* XXX: Did you mean endNode->made instead of gn->made? */ - if (gn->made == ERROR) { - PrintOnError(gn, "\nStop."); - exit(1); - } - } + InitSignals(); + + /* Create the .END node now, to keep the (debug) output of the + * counter.mk test the same as before 2020-09-23. This implementation + * detail probably doesn't matter though. */ + (void)Targ_GetEndNode(); + + if (!opts.queryFlag) + MakeBeginNode(); + + /* + * Expand .USE nodes right now, because they can modify the structure + * of the tree. + */ + Make_ExpandUse(targs); + + while (!Lst_IsEmpty(targs)) { + GNode *gn = Lst_Dequeue(targs); + Compat_Make(gn, gn); + + if (gn->made == UPTODATE) { + printf("`%s' is up to date.\n", gn->name); + } else if (gn->made == ABORTED) { + printf("`%s' not remade because of errors.\n", + gn->name); + } + if (GNode_IsError(gn) && errorNode == NULL) + errorNode = gn; + } + + /* If the user has defined a .END target, run its commands. */ + if (errorNode == NULL) { + GNode *endNode = Targ_GetEndNode(); + Compat_Make(endNode, endNode); + if (GNode_IsError(endNode)) + errorNode = endNode; + } + + if (errorNode != NULL) { + PrintOnError(errorNode, "\nStop."); + exit(1); + } } diff --git a/cond.c b/cond.c index a1b0d75dcb09..1a8aba637fe9 100644 --- a/cond.c +++ b/cond.c @@ -1,1281 +1,1348 @@ -/* $NetBSD: cond.c,v 1.214 2020/11/13 09:01:59 rillig Exp $ */ +/* $NetBSD: cond.c,v 1.235 2021/01/10 21:20:46 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* Handling of conditionals in a makefile. +/* + * Handling of conditionals in a makefile. * * Interface: * Cond_EvalLine Evaluate the conditional directive, such as * '.if ', '.elifnmake ', '.else', '.endif'. * * Cond_EvalCondition * Evaluate the conditional, which is either the argument * of one of the .if directives or the condition in a * ':?then:else' variable modifier. * * Cond_save_depth * Cond_restore_depth * Save and restore the nesting of the conditions, at * the start and end of including another makefile, to * ensure that in each makefile the conditional * directives are well-balanced. */ #include #include "make.h" #include "dir.h" /* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */ -MAKE_RCSID("$NetBSD: cond.c,v 1.214 2020/11/13 09:01:59 rillig Exp $"); +MAKE_RCSID("$NetBSD: cond.c,v 1.235 2021/01/10 21:20:46 rillig Exp $"); /* * The parsing of conditional expressions is based on this grammar: * E -> F || E * E -> F * F -> T && F * F -> T * T -> defined(variable) * T -> make(target) * T -> exists(file) * T -> empty(varspec) * T -> target(name) * T -> commands(name) * T -> symbol * T -> $(varspec) op value * T -> $(varspec) == "string" * T -> $(varspec) != "string" * T -> "string" * T -> ( E ) * T -> ! T * op -> == | != | > | < | >= | <= * * 'symbol' is some other symbol to which the default function is applied. * * The tokens are scanned by CondToken, which returns: * TOK_AND for '&' or '&&' * TOK_OR for '|' or '||' * TOK_NOT for '!' * TOK_LPAREN for '(' * TOK_RPAREN for ')' * Other terminal symbols are evaluated using either the default function or * the function given in the terminal, they return either TOK_TRUE or * TOK_FALSE. * * TOK_FALSE is 0 and TOK_TRUE 1 so we can directly assign C comparisons. * * All non-terminal functions (CondParser_Expr, CondParser_Factor and * CondParser_Term) return either TOK_FALSE, TOK_TRUE, or TOK_ERROR on error. */ typedef enum Token { - TOK_FALSE = 0, TOK_TRUE = 1, TOK_AND, TOK_OR, TOK_NOT, - TOK_LPAREN, TOK_RPAREN, TOK_EOF, TOK_NONE, TOK_ERROR + TOK_FALSE = 0, TOK_TRUE = 1, TOK_AND, TOK_OR, TOK_NOT, + TOK_LPAREN, TOK_RPAREN, TOK_EOF, TOK_NONE, TOK_ERROR } Token; typedef struct CondParser { - const struct If *if_info; /* Info for current statement */ - const char *p; /* The remaining condition to parse */ - Token curr; /* Single push-back token used in parsing */ - - /* Whether an error message has already been printed for this condition. - * The first available error message is usually the most specific one, - * therefore it makes sense to suppress the standard "Malformed - * conditional" message. */ - Boolean printedError; + const struct If *if_info; /* Info for current statement */ + const char *p; /* The remaining condition to parse */ + Token curr; /* Single push-back token used in parsing */ + + /* + * Whether an error message has already been printed for this + * condition. The first available error message is usually the most + * specific one, therefore it makes sense to suppress the standard + * "Malformed conditional" message. + */ + Boolean printedError; } CondParser; static Token CondParser_Expr(CondParser *par, Boolean); static unsigned int cond_depth = 0; /* current .if nesting level */ static unsigned int cond_min_depth = 0; /* depth at makefile open */ /* * Indicate when we should be strict about lhs of comparisons. * In strict mode, the lhs must be a variable expression or a string literal * in quotes. In non-strict mode it may also be an unquoted string literal. * * TRUE when CondEvalExpression is called from Cond_EvalLine (.if etc) * FALSE when CondEvalExpression is called from ApplyModifier_IfElse * since lhs is already expanded, and at that point we cannot tell if * it was a variable reference or not. */ static Boolean lhsStrict; -static int +static Boolean is_token(const char *str, const char *tok, size_t len) { - return strncmp(str, tok, len) == 0 && !ch_isalpha(str[len]); + return strncmp(str, tok, len) == 0 && !ch_isalpha(str[len]); } static Token ToToken(Boolean cond) { - return cond ? TOK_TRUE : TOK_FALSE; + return cond ? TOK_TRUE : TOK_FALSE; } /* Push back the most recent token read. We only need one level of this. */ static void CondParser_PushBack(CondParser *par, Token t) { - assert(par->curr == TOK_NONE); - assert(t != TOK_NONE); + assert(par->curr == TOK_NONE); + assert(t != TOK_NONE); - par->curr = t; + par->curr = t; } static void CondParser_SkipWhitespace(CondParser *par) { - cpp_skip_whitespace(&par->p); + cpp_skip_whitespace(&par->p); } -/* Parse the argument of a built-in function. +/* + * Parse the argument of a built-in function. * * Arguments: * *pp initially points at the '(', * upon successful return it points right after the ')'. * * *out_arg receives the argument as string. * * func says whether the argument belongs to an actual function, or * whether the parsed argument is passed to the default function. * - * Return the length of the argument, or 0 on error. */ + * Return the length of the argument, or 0 on error. + */ static size_t ParseFuncArg(const char **pp, Boolean doEval, const char *func, - char **out_arg) { - const char *p = *pp; - Buffer argBuf; - int paren_depth; - size_t argLen; - - if (func != NULL) - p++; /* Skip opening '(' - verified by caller */ - - if (*p == '\0') { - *out_arg = NULL; /* Missing closing parenthesis: */ - return 0; /* .if defined( */ - } - - cpp_skip_hspace(&p); - - Buf_InitSize(&argBuf, 16); - - paren_depth = 0; - for (;;) { - char ch = *p; - if (ch == '\0' || ch == ' ' || ch == '\t') - break; - if ((ch == '&' || ch == '|') && paren_depth == 0) - break; - if (*p == '$') { - /* - * Parse the variable spec and install it as part of the argument - * if it's valid. We tell Var_Parse to complain on an undefined - * variable, so we don't need to do it. Nor do we return an error, - * though perhaps we should... - */ - void *nestedVal_freeIt; - VarEvalFlags eflags = doEval ? VARE_WANTRES | VARE_UNDEFERR - : VARE_NONE; - const char *nestedVal; - (void)Var_Parse(&p, VAR_CMDLINE, eflags, &nestedVal, - &nestedVal_freeIt); - /* TODO: handle errors */ - Buf_AddStr(&argBuf, nestedVal); - free(nestedVal_freeIt); - continue; + char **out_arg) +{ + const char *p = *pp; + Buffer argBuf; + int paren_depth; + size_t argLen; + + if (func != NULL) + p++; /* Skip opening '(' - verified by caller */ + + if (*p == '\0') { + *out_arg = NULL; /* Missing closing parenthesis: */ + return 0; /* .if defined( */ } - if (ch == '(') - paren_depth++; - else if (ch == ')' && --paren_depth < 0) - break; - Buf_AddByte(&argBuf, *p); - p++; - } - - *out_arg = Buf_GetAll(&argBuf, &argLen); - Buf_Destroy(&argBuf, FALSE); - - cpp_skip_hspace(&p); - - if (func != NULL && *p++ != ')') { - Parse_Error(PARSE_WARNING, "Missing closing parenthesis for %s()", - func); - /* The PARSE_FATAL is done as a follow-up by CondEvalExpression. */ - return 0; - } - - *pp = p; - return argLen; + + cpp_skip_hspace(&p); + + Buf_InitSize(&argBuf, 16); + + paren_depth = 0; + for (;;) { + char ch = *p; + if (ch == '\0' || ch == ' ' || ch == '\t') + break; + if ((ch == '&' || ch == '|') && paren_depth == 0) + break; + if (*p == '$') { + /* + * Parse the variable expression and install it as + * part of the argument if it's valid. We tell + * Var_Parse to complain on an undefined variable, + * (XXX: but Var_Parse ignores that request) + * so we don't need to do it. Nor do we return an + * error, though perhaps we should. + */ + VarEvalFlags eflags = doEval + ? VARE_WANTRES | VARE_UNDEFERR + : VARE_NONE; + FStr nestedVal; + (void)Var_Parse(&p, VAR_CMDLINE, eflags, &nestedVal); + /* TODO: handle errors */ + Buf_AddStr(&argBuf, nestedVal.str); + FStr_Done(&nestedVal); + continue; + } + if (ch == '(') + paren_depth++; + else if (ch == ')' && --paren_depth < 0) + break; + Buf_AddByte(&argBuf, *p); + p++; + } + + *out_arg = Buf_GetAll(&argBuf, &argLen); + Buf_Destroy(&argBuf, FALSE); + + cpp_skip_hspace(&p); + + if (func != NULL && *p++ != ')') { + Parse_Error(PARSE_WARNING, + "Missing closing parenthesis for %s()", + func); + /* The PARSE_FATAL follows in CondEvalExpression. */ + return 0; + } + + *pp = p; + return argLen; } /* Test whether the given variable is defined. */ +/*ARGSUSED*/ static Boolean FuncDefined(size_t argLen MAKE_ATTR_UNUSED, const char *arg) { - void *freeIt; - Boolean result = Var_Value(arg, VAR_CMDLINE, &freeIt) != NULL; - bmake_free(freeIt); - return result; + FStr value = Var_Value(arg, VAR_CMDLINE); + Boolean result = value.str != NULL; + FStr_Done(&value); + return result; } /* See if the given target is being made. */ +/*ARGSUSED*/ static Boolean FuncMake(size_t argLen MAKE_ATTR_UNUSED, const char *arg) { - StringListNode *ln; + StringListNode *ln; - for (ln = opts.create->first; ln != NULL; ln = ln->next) - if (Str_Match(ln->datum, arg)) - return TRUE; - return FALSE; + for (ln = opts.create.first; ln != NULL; ln = ln->next) + if (Str_Match(ln->datum, arg)) + return TRUE; + return FALSE; } /* See if the given file exists. */ +/*ARGSUSED*/ static Boolean FuncExists(size_t argLen MAKE_ATTR_UNUSED, const char *arg) { - Boolean result; - char *path; - - path = Dir_FindFile(arg, dirSearchPath); - DEBUG2(COND, "exists(%s) result is \"%s\"\n", - arg, path != NULL ? path : ""); - result = path != NULL; - free(path); - return result; + Boolean result; + char *path; + + path = Dir_FindFile(arg, &dirSearchPath); + DEBUG2(COND, "exists(%s) result is \"%s\"\n", + arg, path != NULL ? path : ""); + result = path != NULL; + free(path); + return result; } /* See if the given node exists and is an actual target. */ +/*ARGSUSED*/ static Boolean FuncTarget(size_t argLen MAKE_ATTR_UNUSED, const char *arg) { - GNode *gn = Targ_FindNode(arg); - return gn != NULL && GNode_IsTarget(gn); + GNode *gn = Targ_FindNode(arg); + return gn != NULL && GNode_IsTarget(gn); } -/* See if the given node exists and is an actual target with commands - * associated with it. */ +/* + * See if the given node exists and is an actual target with commands + * associated with it. + */ +/*ARGSUSED*/ static Boolean FuncCommands(size_t argLen MAKE_ATTR_UNUSED, const char *arg) { - GNode *gn = Targ_FindNode(arg); - return gn != NULL && GNode_IsTarget(gn) && !Lst_IsEmpty(gn->commands); + GNode *gn = Targ_FindNode(arg); + return gn != NULL && GNode_IsTarget(gn) && !Lst_IsEmpty(&gn->commands); } /* * Convert the given number into a double. * We try a base 10 or 16 integer conversion first, if that fails * then we try a floating point conversion instead. * * Results: * Returns TRUE if the conversion succeeded. * Sets 'out_value' to the converted number. */ static Boolean TryParseNumber(const char *str, double *out_value) { - char *end; - unsigned long ul_val; - double dbl_val; - - errno = 0; - if (str[0] == '\0') { /* XXX: why is an empty string a number? */ - *out_value = 0.0; - return TRUE; - } + char *end; + unsigned long ul_val; + double dbl_val; + + errno = 0; + if (str[0] == '\0') { /* XXX: why is an empty string a number? */ + *out_value = 0.0; + return TRUE; + } - ul_val = strtoul(str, &end, str[1] == 'x' ? 16 : 10); - if (*end == '\0' && errno != ERANGE) { - *out_value = str[0] == '-' ? -(double)-ul_val : (double)ul_val; - return TRUE; - } + ul_val = strtoul(str, &end, str[1] == 'x' ? 16 : 10); + if (*end == '\0' && errno != ERANGE) { + *out_value = str[0] == '-' ? -(double)-ul_val : (double)ul_val; + return TRUE; + } - if (*end != '\0' && *end != '.' && *end != 'e' && *end != 'E') - return FALSE; /* skip the expensive strtod call */ - dbl_val = strtod(str, &end); - if (*end != '\0') - return FALSE; + if (*end != '\0' && *end != '.' && *end != 'e' && *end != 'E') + return FALSE; /* skip the expensive strtod call */ + dbl_val = strtod(str, &end); + if (*end != '\0') + return FALSE; - *out_value = dbl_val; - return TRUE; + *out_value = dbl_val; + return TRUE; } static Boolean is_separator(char ch) { - return ch == '\0' || ch_isspace(ch) || strchr("!=><)", ch) != NULL; + return ch == '\0' || ch_isspace(ch) || strchr("!=><)", ch) != NULL; } /*- * Parse a string from a variable reference or an optionally quoted * string. This is called for the lhs and rhs of string comparisons. * * Results: * Returns the string, absent any quotes, or NULL on error. * Sets out_quoted if the string was quoted. * Sets out_freeIt. */ /* coverity:[+alloc : arg-*4] */ -static const char * +static void CondParser_String(CondParser *par, Boolean doEval, Boolean strictLHS, - Boolean *out_quoted, void **out_freeIt) + FStr *out_str, Boolean *out_quoted) { - Buffer buf; - const char *str; - Boolean atStart; - const char *nested_p; - Boolean quoted; - const char *start; - VarEvalFlags eflags; - VarParseResult parseResult; - - Buf_Init(&buf); - str = NULL; - *out_freeIt = NULL; - *out_quoted = quoted = par->p[0] == '"'; - start = par->p; - if (quoted) - par->p++; - while (par->p[0] != '\0' && str == NULL) { - switch (par->p[0]) { - case '\\': - par->p++; - if (par->p[0] != '\0') { - Buf_AddByte(&buf, par->p[0]); + Buffer buf; + FStr str; + Boolean atStart; + const char *nested_p; + Boolean quoted; + const char *start; + VarEvalFlags eflags; + VarParseResult parseResult; + + Buf_Init(&buf); + str = FStr_InitRefer(NULL); + *out_quoted = quoted = par->p[0] == '"'; + start = par->p; + if (quoted) par->p++; - } - continue; - case '"': - if (quoted) { - par->p++; /* skip the closing quote */ - goto got_str; - } - Buf_AddByte(&buf, par->p[0]); /* likely? */ - par->p++; - continue; - case ')': /* see is_separator */ - case '!': - case '=': - case '>': - case '<': - case ' ': - case '\t': - if (!quoted) - goto got_str; - Buf_AddByte(&buf, par->p[0]); - par->p++; - continue; - case '$': - /* if we are in quotes, an undefined variable is ok */ - eflags = doEval && !quoted ? VARE_WANTRES | VARE_UNDEFERR : - doEval ? VARE_WANTRES : - VARE_NONE; - - nested_p = par->p; - atStart = nested_p == start; - parseResult = Var_Parse(&nested_p, VAR_CMDLINE, eflags, &str, - out_freeIt); - /* TODO: handle errors */ - if (str == var_Error) { - if (parseResult & VPR_ANY_MSG) - par->printedError = TRUE; - if (*out_freeIt != NULL) { - /* XXX: Can there be any situation in which a returned - * var_Error requires freeIt? */ - free(*out_freeIt); - *out_freeIt = NULL; + + while (par->p[0] != '\0' && str.str == NULL) { + switch (par->p[0]) { + case '\\': + par->p++; + if (par->p[0] != '\0') { + Buf_AddByte(&buf, par->p[0]); + par->p++; + } + continue; + case '"': + if (quoted) { + par->p++; /* skip the closing quote */ + goto got_str; + } + Buf_AddByte(&buf, par->p[0]); /* likely? */ + par->p++; + continue; + case ')': /* see is_separator */ + case '!': + case '=': + case '>': + case '<': + case ' ': + case '\t': + if (!quoted) + goto got_str; + Buf_AddByte(&buf, par->p[0]); + par->p++; + continue; + case '$': + /* if we are in quotes, an undefined variable is ok */ + eflags = + doEval && !quoted ? VARE_WANTRES | VARE_UNDEFERR : + doEval ? VARE_WANTRES : + VARE_NONE; + + nested_p = par->p; + atStart = nested_p == start; + parseResult = Var_Parse(&nested_p, VAR_CMDLINE, eflags, + &str); + /* TODO: handle errors */ + if (str.str == var_Error) { + if (parseResult == VPR_ERR) + par->printedError = TRUE; + /* + * XXX: Can there be any situation in which + * a returned var_Error requires freeIt? + */ + FStr_Done(&str); + /* + * Even if !doEval, we still report syntax + * errors, which is what getting var_Error + * back with !doEval means. + */ + str = FStr_InitRefer(NULL); + goto cleanup; + } + par->p = nested_p; + + /* + * If the '$' started the string literal (which means + * no quotes), and the variable expression is followed + * by a space, looks like a comparison operator or is + * the end of the expression, we are done. + */ + if (atStart && is_separator(par->p[0])) + goto cleanup; + + Buf_AddStr(&buf, str.str); + FStr_Done(&str); + str = FStr_InitRefer(NULL); /* not finished yet */ + continue; + default: + if (strictLHS && !quoted && *start != '$' && + !ch_isdigit(*start)) { + /* + * The left-hand side must be quoted, + * a variable reference or a number. + */ + str = FStr_InitRefer(NULL); + goto cleanup; + } + Buf_AddByte(&buf, par->p[0]); + par->p++; + continue; } - /* - * Even if !doEval, we still report syntax errors, which - * is what getting var_Error back with !doEval means. - */ - str = NULL; - goto cleanup; - } - par->p = nested_p; - - /* - * If the '$' started the string literal (which means no quotes), - * and the variable expression is followed by a space, looks like - * a comparison operator or is the end of the expression, we are - * done. - */ - if (atStart && is_separator(par->p[0])) - goto cleanup; - - Buf_AddStr(&buf, str); - if (*out_freeIt) { - free(*out_freeIt); - *out_freeIt = NULL; - } - str = NULL; /* not finished yet */ - continue; - default: - if (strictLHS && !quoted && *start != '$' && !ch_isdigit(*start)) { - /* lhs must be quoted, a variable reference or number */ - str = NULL; - goto cleanup; - } - Buf_AddByte(&buf, par->p[0]); - par->p++; - continue; } - } got_str: - *out_freeIt = Buf_GetAll(&buf, NULL); - str = *out_freeIt; + str = FStr_InitOwn(Buf_GetAll(&buf, NULL)); cleanup: - Buf_Destroy(&buf, FALSE); - return str; + Buf_Destroy(&buf, FALSE); + *out_str = str; } struct If { - const char *form; /* Form of if */ - size_t formlen; /* Length of form */ - Boolean doNot; /* TRUE if default function should be negated */ - Boolean (*defProc)(size_t, const char *); /* Default function to apply */ + const char *form; /* Form of if */ + size_t formlen; /* Length of form */ + Boolean doNot; /* TRUE if default function should be negated */ + /* The default function to apply on unquoted bare words. */ + Boolean (*defProc)(size_t, const char *); }; /* The different forms of .if directives. */ static const struct If ifs[] = { { "def", 3, FALSE, FuncDefined }, { "ndef", 4, TRUE, FuncDefined }, { "make", 4, FALSE, FuncMake }, { "nmake", 5, TRUE, FuncMake }, { "", 0, FALSE, FuncDefined }, { NULL, 0, FALSE, NULL } }; -enum { PLAIN_IF_INDEX = 4 }; +enum { + PLAIN_IF_INDEX = 4 +}; static Boolean If_Eval(const struct If *if_info, const char *arg, size_t arglen) { - Boolean res = if_info->defProc(arglen, arg); - return if_info->doNot ? !res : res; + Boolean res = if_info->defProc(arglen, arg); + return if_info->doNot ? !res : res; } -/* Evaluate a "comparison without operator", such as in ".if ${VAR}" or - * ".if 0". */ +/* + * Evaluate a "comparison without operator", such as in ".if ${VAR}" or + * ".if 0". + */ static Boolean EvalNotEmpty(CondParser *par, const char *value, Boolean quoted) { - double num; + double num; - /* For .ifxxx "...", check for non-empty string. */ - if (quoted) - return value[0] != '\0'; + /* For .ifxxx "...", check for non-empty string. */ + if (quoted) + return value[0] != '\0'; - /* For .ifxxx , compare against zero */ - if (TryParseNumber(value, &num)) - return num != 0.0; + /* For .ifxxx , compare against zero */ + if (TryParseNumber(value, &num)) + return num != 0.0; - /* For .if ${...}, check for non-empty string. This is different from - * the evaluation function from that .if variant, which would test - * whether a variable of the given name were defined. */ - /* XXX: Whitespace should count as empty, just as in ParseEmptyArg. */ - if (par->if_info->form[0] == '\0') - return value[0] != '\0'; + /* For .if ${...}, check for non-empty string. This is different from + * the evaluation function from that .if variant, which would test + * whether a variable of the given name were defined. */ + /* XXX: Whitespace should count as empty, just as in ParseEmptyArg. */ + if (par->if_info->form[0] == '\0') + return value[0] != '\0'; - /* For the other variants of .ifxxx ${...}, use its default function. */ - return If_Eval(par->if_info, value, strlen(value)); + /* For the other variants of .ifxxx ${...}, use its default function. */ + return If_Eval(par->if_info, value, strlen(value)); } /* Evaluate a numerical comparison, such as in ".if ${VAR} >= 9". */ static Token EvalCompareNum(double lhs, const char *op, double rhs) { - DEBUG3(COND, "lhs = %f, rhs = %f, op = %.2s\n", lhs, rhs, op); - - switch (op[0]) { - case '!': - if (op[1] != '=') { - Parse_Error(PARSE_WARNING, "Unknown operator"); - /* The PARSE_FATAL is done as a follow-up by CondEvalExpression. */ - return TOK_ERROR; - } - return ToToken(lhs != rhs); - case '=': - if (op[1] != '=') { - Parse_Error(PARSE_WARNING, "Unknown operator"); - /* The PARSE_FATAL is done as a follow-up by CondEvalExpression. */ - return TOK_ERROR; + DEBUG3(COND, "lhs = %f, rhs = %f, op = %.2s\n", lhs, rhs, op); + + switch (op[0]) { + case '!': + if (op[1] != '=') { + Parse_Error(PARSE_WARNING, "Unknown operator"); + /* The PARSE_FATAL follows in CondEvalExpression. */ + return TOK_ERROR; + } + return ToToken(lhs != rhs); + case '=': + if (op[1] != '=') { + Parse_Error(PARSE_WARNING, "Unknown operator"); + /* The PARSE_FATAL follows in CondEvalExpression. */ + return TOK_ERROR; + } + return ToToken(lhs == rhs); + case '<': + return ToToken(op[1] == '=' ? lhs <= rhs : lhs < rhs); + case '>': + return ToToken(op[1] == '=' ? lhs >= rhs : lhs > rhs); } - return ToToken(lhs == rhs); - case '<': - return ToToken(op[1] == '=' ? lhs <= rhs : lhs < rhs); - case '>': - return ToToken(op[1] == '=' ? lhs >= rhs : lhs > rhs); - } - return TOK_ERROR; + return TOK_ERROR; } static Token EvalCompareStr(const char *lhs, const char *op, const char *rhs) { - if (!((op[0] == '!' || op[0] == '=') && op[1] == '=')) { - Parse_Error(PARSE_WARNING, - "String comparison operator must be either == or !="); - /* The PARSE_FATAL is done as a follow-up by CondEvalExpression. */ - return TOK_ERROR; - } + if (!((op[0] == '!' || op[0] == '=') && op[1] == '=')) { + Parse_Error(PARSE_WARNING, + "String comparison operator " + "must be either == or !="); + /* The PARSE_FATAL follows in CondEvalExpression. */ + return TOK_ERROR; + } - DEBUG3(COND, "lhs = \"%s\", rhs = \"%s\", op = %.2s\n", lhs, rhs, op); - return ToToken((*op == '=') == (strcmp(lhs, rhs) == 0)); + DEBUG3(COND, "lhs = \"%s\", rhs = \"%s\", op = %.2s\n", lhs, rhs, op); + return ToToken((*op == '=') == (strcmp(lhs, rhs) == 0)); } /* Evaluate a comparison, such as "${VAR} == 12345". */ static Token EvalCompare(const char *lhs, Boolean lhsQuoted, const char *op, const char *rhs, Boolean rhsQuoted) { - double left, right; + double left, right; - if (!rhsQuoted && !lhsQuoted) - if (TryParseNumber(lhs, &left) && TryParseNumber(rhs, &right)) - return EvalCompareNum(left, op, right); + if (!rhsQuoted && !lhsQuoted) + if (TryParseNumber(lhs, &left) && TryParseNumber(rhs, &right)) + return EvalCompareNum(left, op, right); - return EvalCompareStr(lhs, op, rhs); + return EvalCompareStr(lhs, op, rhs); } -/* Parse a comparison condition such as: +/* + * Parse a comparison condition such as: * * 0 * ${VAR:Mpattern} * ${VAR} == value * ${VAR:U0} < 12345 */ static Token CondParser_Comparison(CondParser *par, Boolean doEval) { - Token t = TOK_ERROR; - const char *lhs, *op, *rhs; - void *lhs_freeIt, *rhs_freeIt; - Boolean lhsQuoted, rhsQuoted; - - /* - * Parse the variable spec and skip over it, saving its - * value in lhs. - */ - lhs = CondParser_String(par, doEval, lhsStrict, &lhsQuoted, &lhs_freeIt); - if (lhs == NULL) - goto done_lhs; - - CondParser_SkipWhitespace(par); - - op = par->p; - switch (par->p[0]) { - case '!': - case '=': - case '<': - case '>': - if (par->p[1] == '=') - par->p += 2; - else - par->p++; - break; - default: - /* Unknown operator, compare against an empty string or 0. */ - t = ToToken(doEval && EvalNotEmpty(par, lhs, lhsQuoted)); - goto done_lhs; - } - - CondParser_SkipWhitespace(par); - - if (par->p[0] == '\0') { - Parse_Error(PARSE_WARNING, "Missing right-hand-side of operator"); - /* The PARSE_FATAL is done as a follow-up by CondEvalExpression. */ - goto done_lhs; - } - - rhs = CondParser_String(par, doEval, FALSE, &rhsQuoted, &rhs_freeIt); - if (rhs == NULL) - goto done_rhs; - - if (!doEval) { - t = TOK_FALSE; - goto done_rhs; - } - - t = EvalCompare(lhs, lhsQuoted, op, rhs, rhsQuoted); + Token t = TOK_ERROR; + FStr lhs, rhs; + const char *op; + Boolean lhsQuoted, rhsQuoted; + + /* + * Parse the variable spec and skip over it, saving its + * value in lhs. + */ + CondParser_String(par, doEval, lhsStrict, &lhs, &lhsQuoted); + if (lhs.str == NULL) + goto done_lhs; + + CondParser_SkipWhitespace(par); + + op = par->p; + switch (par->p[0]) { + case '!': + case '=': + case '<': + case '>': + if (par->p[1] == '=') + par->p += 2; + else + par->p++; + break; + default: + /* Unknown operator, compare against an empty string or 0. */ + t = ToToken(doEval && EvalNotEmpty(par, lhs.str, lhsQuoted)); + goto done_lhs; + } + + CondParser_SkipWhitespace(par); + + if (par->p[0] == '\0') { + Parse_Error(PARSE_WARNING, + "Missing right-hand-side of operator"); + /* The PARSE_FATAL follows in CondEvalExpression. */ + goto done_lhs; + } + + CondParser_String(par, doEval, FALSE, &rhs, &rhsQuoted); + if (rhs.str == NULL) + goto done_rhs; + + if (!doEval) { + t = TOK_FALSE; + goto done_rhs; + } + + t = EvalCompare(lhs.str, lhsQuoted, op, rhs.str, rhsQuoted); done_rhs: - free(rhs_freeIt); + FStr_Done(&rhs); done_lhs: - free(lhs_freeIt); - return t; + FStr_Done(&lhs); + return t; } -/* The argument to empty() is a variable name, optionally followed by - * variable modifiers. */ +/* + * The argument to empty() is a variable name, optionally followed by + * variable modifiers. + */ +/*ARGSUSED*/ static size_t ParseEmptyArg(const char **pp, Boolean doEval, const char *func MAKE_ATTR_UNUSED, char **out_arg) { - void *val_freeIt; - const char *val; - size_t magic_res; - - /* We do all the work here and return the result as the length */ - *out_arg = NULL; - - (*pp)--; /* Make (*pp)[1] point to the '('. */ - (void)Var_Parse(pp, VAR_CMDLINE, doEval ? VARE_WANTRES : VARE_NONE, - &val, &val_freeIt); - /* TODO: handle errors */ - /* If successful, *pp points beyond the closing ')' now. */ - - if (val == var_Error) { - free(val_freeIt); - return (size_t)-1; - } - - /* A variable is empty when it just contains spaces... 4/15/92, christos */ - cpp_skip_whitespace(&val); - - /* - * For consistency with the other functions we can't generate the - * true/false here. - */ - magic_res = *val != '\0' ? 2 : 1; - free(val_freeIt); - return magic_res; + FStr val; + size_t magic_res; + + /* We do all the work here and return the result as the length */ + *out_arg = NULL; + + (*pp)--; /* Make (*pp)[1] point to the '('. */ + (void)Var_Parse(pp, VAR_CMDLINE, doEval ? VARE_WANTRES : VARE_NONE, + &val); + /* TODO: handle errors */ + /* If successful, *pp points beyond the closing ')' now. */ + + if (val.str == var_Error) { + FStr_Done(&val); + return (size_t)-1; + } + + /* + * A variable is empty when it just contains spaces... + * 4/15/92, christos + */ + cpp_skip_whitespace(&val.str); + + /* + * For consistency with the other functions we can't generate the + * true/false here. + */ + magic_res = val.str[0] != '\0' ? 2 : 1; + FStr_Done(&val); + return magic_res; } +/*ARGSUSED*/ static Boolean FuncEmpty(size_t arglen, const char *arg MAKE_ATTR_UNUSED) { - /* Magic values ahead, see ParseEmptyArg. */ - return arglen == 1; + /* Magic values ahead, see ParseEmptyArg. */ + return arglen == 1; } static Boolean CondParser_Func(CondParser *par, Boolean doEval, Token *out_token) { - static const struct fn_def { - const char *fn_name; - size_t fn_name_len; - size_t (*fn_parse)(const char **, Boolean, const char *, char **); - Boolean (*fn_eval)(size_t, const char *); - } fns[] = { - { "defined", 7, ParseFuncArg, FuncDefined }, - { "make", 4, ParseFuncArg, FuncMake }, - { "exists", 6, ParseFuncArg, FuncExists }, - { "empty", 5, ParseEmptyArg, FuncEmpty }, - { "target", 6, ParseFuncArg, FuncTarget }, - { "commands", 8, ParseFuncArg, FuncCommands } - }; - const struct fn_def *fn; - char *arg = NULL; - size_t arglen; - const char *cp = par->p; - const struct fn_def *fns_end = fns + sizeof fns / sizeof fns[0]; - - for (fn = fns; fn != fns_end; fn++) { - if (!is_token(cp, fn->fn_name, fn->fn_name_len)) - continue; - - cp += fn->fn_name_len; - cpp_skip_whitespace(&cp); - if (*cp != '(') - break; - - arglen = fn->fn_parse(&cp, doEval, fn->fn_name, &arg); - if (arglen == 0 || arglen == (size_t)-1) { - par->p = cp; - *out_token = arglen == 0 ? TOK_FALSE : TOK_ERROR; - return TRUE; - } + static const struct fn_def { + const char *fn_name; + size_t fn_name_len; + size_t (*fn_parse)(const char **, Boolean, const char *, + char **); + Boolean (*fn_eval)(size_t, const char *); + } fns[] = { + { "defined", 7, ParseFuncArg, FuncDefined }, + { "make", 4, ParseFuncArg, FuncMake }, + { "exists", 6, ParseFuncArg, FuncExists }, + { "empty", 5, ParseEmptyArg, FuncEmpty }, + { "target", 6, ParseFuncArg, FuncTarget }, + { "commands", 8, ParseFuncArg, FuncCommands } + }; + const struct fn_def *fn; + char *arg = NULL; + size_t arglen; + const char *cp = par->p; + const struct fn_def *fns_end = fns + sizeof fns / sizeof fns[0]; + + for (fn = fns; fn != fns_end; fn++) { + if (!is_token(cp, fn->fn_name, fn->fn_name_len)) + continue; + + cp += fn->fn_name_len; + cpp_skip_whitespace(&cp); + if (*cp != '(') + break; + + arglen = fn->fn_parse(&cp, doEval, fn->fn_name, &arg); + if (arglen == 0 || arglen == (size_t)-1) { + par->p = cp; + *out_token = arglen == 0 ? TOK_FALSE : TOK_ERROR; + return TRUE; + } - /* Evaluate the argument using the required function. */ - *out_token = ToToken(!doEval || fn->fn_eval(arglen, arg)); - free(arg); - par->p = cp; - return TRUE; - } + /* Evaluate the argument using the required function. */ + *out_token = ToToken(!doEval || fn->fn_eval(arglen, arg)); + free(arg); + par->p = cp; + return TRUE; + } - return FALSE; + return FALSE; } -/* Parse a function call, a number, a variable expression or a string - * literal. */ +/* + * Parse a function call, a number, a variable expression or a string + * literal. + */ static Token CondParser_LeafToken(CondParser *par, Boolean doEval) { - Token t; - char *arg = NULL; - size_t arglen; - const char *cp = par->p; - const char *cp1; + Token t; + char *arg = NULL; + size_t arglen; + const char *cp; + const char *cp1; - if (CondParser_Func(par, doEval, &t)) - return t; + if (CondParser_Func(par, doEval, &t)) + return t; - /* Push anything numeric through the compare expression */ - cp = par->p; - if (ch_isdigit(cp[0]) || cp[0] == '-' || cp[0] == '+') - return CondParser_Comparison(par, doEval); - - /* - * Most likely we have a naked token to apply the default function to. - * However ".if a == b" gets here when the "a" is unquoted and doesn't - * start with a '$'. This surprises people. - * If what follows the function argument is a '=' or '!' then the syntax - * would be invalid if we did "defined(a)" - so instead treat as an - * expression. - */ - arglen = ParseFuncArg(&cp, doEval, NULL, &arg); - cp1 = cp; - cpp_skip_whitespace(&cp1); - if (*cp1 == '=' || *cp1 == '!') - return CondParser_Comparison(par, doEval); - par->p = cp; - - /* - * Evaluate the argument using the default function. - * This path always treats .if as .ifdef. To get here, the character - * after .if must have been taken literally, so the argument cannot - * be empty - even if it contained a variable expansion. - */ - t = ToToken(!doEval || If_Eval(par->if_info, arg, arglen)); - free(arg); - return t; + /* Push anything numeric through the compare expression */ + cp = par->p; + if (ch_isdigit(cp[0]) || cp[0] == '-' || cp[0] == '+') + return CondParser_Comparison(par, doEval); + + /* + * Most likely we have a naked token to apply the default function to. + * However ".if a == b" gets here when the "a" is unquoted and doesn't + * start with a '$'. This surprises people. + * If what follows the function argument is a '=' or '!' then the + * syntax would be invalid if we did "defined(a)" - so instead treat + * as an expression. + */ + arglen = ParseFuncArg(&cp, doEval, NULL, &arg); + cp1 = cp; + cpp_skip_whitespace(&cp1); + if (*cp1 == '=' || *cp1 == '!') + return CondParser_Comparison(par, doEval); + par->p = cp; + + /* + * Evaluate the argument using the default function. + * This path always treats .if as .ifdef. To get here, the character + * after .if must have been taken literally, so the argument cannot + * be empty - even if it contained a variable expansion. + */ + t = ToToken(!doEval || If_Eval(par->if_info, arg, arglen)); + free(arg); + return t; } /* Return the next token or comparison result from the parser. */ static Token CondParser_Token(CondParser *par, Boolean doEval) { - Token t; + Token t; - t = par->curr; - if (t != TOK_NONE) { - par->curr = TOK_NONE; - return t; - } + t = par->curr; + if (t != TOK_NONE) { + par->curr = TOK_NONE; + return t; + } - cpp_skip_hspace(&par->p); + cpp_skip_hspace(&par->p); - switch (par->p[0]) { + switch (par->p[0]) { - case '(': - par->p++; - return TOK_LPAREN; + case '(': + par->p++; + return TOK_LPAREN; - case ')': - par->p++; - return TOK_RPAREN; + case ')': + par->p++; + return TOK_RPAREN; - case '|': - par->p++; - if (par->p[0] == '|') - par->p++; - else if (opts.lint) { - Parse_Error(PARSE_FATAL, "Unknown operator '|'"); - par->printedError = TRUE; - return TOK_ERROR; - } - return TOK_OR; - - case '&': - par->p++; - if (par->p[0] == '&') - par->p++; - else if (opts.lint) { - Parse_Error(PARSE_FATAL, "Unknown operator '&'"); - par->printedError = TRUE; - return TOK_ERROR; - } - return TOK_AND; + case '|': + par->p++; + if (par->p[0] == '|') + par->p++; + else if (opts.strict) { + Parse_Error(PARSE_FATAL, "Unknown operator '|'"); + par->printedError = TRUE; + return TOK_ERROR; + } + return TOK_OR; - case '!': - par->p++; - return TOK_NOT; + case '&': + par->p++; + if (par->p[0] == '&') + par->p++; + else if (opts.strict) { + Parse_Error(PARSE_FATAL, "Unknown operator '&'"); + par->printedError = TRUE; + return TOK_ERROR; + } + return TOK_AND; - case '#': /* XXX: see unit-tests/cond-token-plain.mk */ - case '\n': /* XXX: why should this end the condition? */ - /* Probably obsolete now, from 1993-03-21. */ - case '\0': - return TOK_EOF; + case '!': + par->p++; + return TOK_NOT; - case '"': - case '$': - return CondParser_Comparison(par, doEval); + case '#': /* XXX: see unit-tests/cond-token-plain.mk */ + case '\n': /* XXX: why should this end the condition? */ + /* Probably obsolete now, from 1993-03-21. */ + case '\0': + return TOK_EOF; - default: - return CondParser_LeafToken(par, doEval); - } + case '"': + case '$': + return CondParser_Comparison(par, doEval); + + default: + return CondParser_LeafToken(par, doEval); + } } -/* Parse a single term in the expression. This consists of a terminal symbol +/* + * Parse a single term in the expression. This consists of a terminal symbol * or TOK_NOT and a term (not including the binary operators): * * T -> defined(variable) | make(target) | exists(file) | symbol * T -> ! T | ( E ) * * Results: * TOK_TRUE, TOK_FALSE or TOK_ERROR. */ static Token CondParser_Term(CondParser *par, Boolean doEval) { - Token t; + Token t; - t = CondParser_Token(par, doEval); + t = CondParser_Token(par, doEval); - if (t == TOK_EOF) { - /* - * If we reached the end of the expression, the expression - * is malformed... - */ - t = TOK_ERROR; - } else if (t == TOK_LPAREN) { - /* - * T -> ( E ) - */ - t = CondParser_Expr(par, doEval); - if (t != TOK_ERROR) { - if (CondParser_Token(par, doEval) != TOK_RPAREN) { + if (t == TOK_EOF) { + /* + * If we reached the end of the expression, the expression + * is malformed... + */ t = TOK_ERROR; - } - } - } else if (t == TOK_NOT) { - t = CondParser_Term(par, doEval); - if (t == TOK_TRUE) { - t = TOK_FALSE; - } else if (t == TOK_FALSE) { - t = TOK_TRUE; + } else if (t == TOK_LPAREN) { + /* + * T -> ( E ) + */ + t = CondParser_Expr(par, doEval); + if (t != TOK_ERROR) { + if (CondParser_Token(par, doEval) != TOK_RPAREN) { + t = TOK_ERROR; + } + } + } else if (t == TOK_NOT) { + t = CondParser_Term(par, doEval); + if (t == TOK_TRUE) { + t = TOK_FALSE; + } else if (t == TOK_FALSE) { + t = TOK_TRUE; + } } - } - return t; + return t; } -/* Parse a conjunctive factor (nice name, wot?) +/* + * Parse a conjunctive factor (nice name, wot?) * * F -> T && F | T * * Results: * TOK_TRUE, TOK_FALSE or TOK_ERROR */ static Token CondParser_Factor(CondParser *par, Boolean doEval) { - Token l, o; - - l = CondParser_Term(par, doEval); - if (l != TOK_ERROR) { - o = CondParser_Token(par, doEval); - - if (o == TOK_AND) { - /* - * F -> T && F - * - * If T is TOK_FALSE, the whole thing will be TOK_FALSE, but we - * have to parse the r.h.s. anyway (to throw it away). - * If T is TOK_TRUE, the result is the r.h.s., be it a TOK_ERROR - * or not. - */ - if (l == TOK_TRUE) { - l = CondParser_Factor(par, doEval); - } else { - (void)CondParser_Factor(par, FALSE); - } - } else { - /* - * F -> T - */ - CondParser_PushBack(par, o); + Token l, o; + + l = CondParser_Term(par, doEval); + if (l != TOK_ERROR) { + o = CondParser_Token(par, doEval); + + if (o == TOK_AND) { + /* + * F -> T && F + * + * If T is TOK_FALSE, the whole thing will be + * TOK_FALSE, but we have to parse the r.h.s. anyway + * (to throw it away). If T is TOK_TRUE, the result + * is the r.h.s., be it a TOK_ERROR or not. + */ + if (l == TOK_TRUE) { + l = CondParser_Factor(par, doEval); + } else { + (void)CondParser_Factor(par, FALSE); + } + } else { + /* + * F -> T + */ + CondParser_PushBack(par, o); + } } - } - return l; + return l; } -/* Main expression production. +/* + * Main expression production. * * E -> F || E | F * * Results: * TOK_TRUE, TOK_FALSE or TOK_ERROR. */ static Token CondParser_Expr(CondParser *par, Boolean doEval) { - Token l, o; - - l = CondParser_Factor(par, doEval); - if (l != TOK_ERROR) { - o = CondParser_Token(par, doEval); - - if (o == TOK_OR) { - /* - * E -> F || E - * - * A similar thing occurs for ||, except that here we make sure - * the l.h.s. is TOK_FALSE before we bother to evaluate the r.h.s. - * Once again, if l is TOK_FALSE, the result is the r.h.s. and once - * again if l is TOK_TRUE, we parse the r.h.s. to throw it away. - */ - if (l == TOK_FALSE) { - l = CondParser_Expr(par, doEval); - } else { - (void)CondParser_Expr(par, FALSE); - } - } else { - /* - * E -> F - */ - CondParser_PushBack(par, o); + Token l, o; + + l = CondParser_Factor(par, doEval); + if (l != TOK_ERROR) { + o = CondParser_Token(par, doEval); + + if (o == TOK_OR) { + /* + * E -> F || E + * + * A similar thing occurs for ||, except that here + * we make sure the l.h.s. is TOK_FALSE before we + * bother to evaluate the r.h.s. Once again, if l + * is TOK_FALSE, the result is the r.h.s. and once + * again if l is TOK_TRUE, we parse the r.h.s. to + * throw it away. + */ + if (l == TOK_FALSE) { + l = CondParser_Expr(par, doEval); + } else { + (void)CondParser_Expr(par, FALSE); + } + } else { + /* + * E -> F + */ + CondParser_PushBack(par, o); + } } - } - return l; + return l; } static CondEvalResult CondParser_Eval(CondParser *par, Boolean *value) { - Token res; + Token res; - DEBUG1(COND, "CondParser_Eval: %s\n", par->p); + DEBUG1(COND, "CondParser_Eval: %s\n", par->p); - res = CondParser_Expr(par, TRUE); - if (res != TOK_FALSE && res != TOK_TRUE) - return COND_INVALID; + res = CondParser_Expr(par, TRUE); + if (res != TOK_FALSE && res != TOK_TRUE) + return COND_INVALID; - if (CondParser_Token(par, TRUE /* XXX: Why TRUE? */) != TOK_EOF) - return COND_INVALID; + if (CondParser_Token(par, FALSE) != TOK_EOF) + return COND_INVALID; - *value = res == TOK_TRUE; - return COND_PARSE; + *value = res == TOK_TRUE; + return COND_PARSE; } -/* Evaluate the condition, including any side effects from the variable +/* + * Evaluate the condition, including any side effects from the variable * expressions in the condition. The condition consists of &&, ||, !, * function(arg), comparisons and parenthetical groupings thereof. * * Results: * COND_PARSE if the condition was valid grammatically * COND_INVALID if not a valid conditional. * * (*value) is set to the boolean value of the condition */ static CondEvalResult CondEvalExpression(const struct If *info, const char *cond, Boolean *value, - Boolean eprint, Boolean strictLHS) + Boolean eprint, Boolean strictLHS) { - CondParser par; - CondEvalResult rval; + CondParser par; + CondEvalResult rval; - lhsStrict = strictLHS; + lhsStrict = strictLHS; - cpp_skip_hspace(&cond); + cpp_skip_hspace(&cond); - par.if_info = info != NULL ? info : ifs + PLAIN_IF_INDEX; - par.p = cond; - par.curr = TOK_NONE; - par.printedError = FALSE; + par.if_info = info != NULL ? info : ifs + PLAIN_IF_INDEX; + par.p = cond; + par.curr = TOK_NONE; + par.printedError = FALSE; - rval = CondParser_Eval(&par, value); + rval = CondParser_Eval(&par, value); - if (rval == COND_INVALID && eprint && !par.printedError) - Parse_Error(PARSE_FATAL, "Malformed conditional (%s)", cond); + if (rval == COND_INVALID && eprint && !par.printedError) + Parse_Error(PARSE_FATAL, "Malformed conditional (%s)", cond); - return rval; + return rval; } -/* Evaluate a condition in a :? modifier, such as - * ${"${VAR}" == value:?yes:no}. */ +/* + * Evaluate a condition in a :? modifier, such as + * ${"${VAR}" == value:?yes:no}. + */ CondEvalResult Cond_EvalCondition(const char *cond, Boolean *out_value) { return CondEvalExpression(NULL, cond, out_value, FALSE, FALSE); } -/* Evaluate the conditional directive in the line, which is one of: +static Boolean +IsEndif(const char *p) +{ + return p[0] == 'e' && p[1] == 'n' && p[2] == 'd' && + p[3] == 'i' && p[4] == 'f' && !ch_isalpha(p[5]); +} + +/* + * Evaluate the conditional directive in the line, which is one of: * * .if * .ifmake * .ifnmake * .ifdef * .ifndef * .elif * .elifmake * .elifnmake * .elifdef * .elifndef * .else * .endif * * In these directives, consists of &&, ||, !, function(arg), * comparisons, expressions, bare words, numbers and strings, and * parenthetical groupings thereof. * * Results: * COND_PARSE to continue parsing the lines that follow the * conditional (when evaluates to TRUE) * COND_SKIP to skip the lines after the conditional * (when evaluates to FALSE, or when a previous * branch has already been taken) * COND_INVALID if the conditional was not valid, either because of * a syntax error or because some variable was undefined * or because the condition could not be evaluated */ CondEvalResult -Cond_EvalLine(const char *const line) +Cond_EvalLine(const char *line) { - typedef enum IfState { + typedef enum IfState { - /* None of the previous evaluated to TRUE. */ - IFS_INITIAL = 0, + /* None of the previous evaluated to TRUE. */ + IFS_INITIAL = 0, - /* The previous evaluated to TRUE. - * The lines following this condition are interpreted. */ - IFS_ACTIVE = 1 << 0, + /* The previous evaluated to TRUE. + * The lines following this condition are interpreted. */ + IFS_ACTIVE = 1 << 0, - /* The previous directive was an '.else'. */ - IFS_SEEN_ELSE = 1 << 1, + /* The previous directive was an '.else'. */ + IFS_SEEN_ELSE = 1 << 1, - /* One of the previous evaluated to TRUE. */ - IFS_WAS_ACTIVE = 1 << 2 + /* One of the previous evaluated to TRUE. */ + IFS_WAS_ACTIVE = 1 << 2 - } IfState; + } IfState; - static enum IfState *cond_states = NULL; - static unsigned int cond_states_cap = 128; + static enum IfState *cond_states = NULL; + static unsigned int cond_states_cap = 128; - const struct If *ifp; - Boolean isElif; - Boolean value; - IfState state; - const char *p = line; + const struct If *ifp; + Boolean isElif; + Boolean value; + IfState state; + const char *p = line; - if (cond_states == NULL) { - cond_states = bmake_malloc(cond_states_cap * sizeof *cond_states); - cond_states[0] = IFS_ACTIVE; - } + if (cond_states == NULL) { + cond_states = bmake_malloc( + cond_states_cap * sizeof *cond_states); + cond_states[0] = IFS_ACTIVE; + } - p++; /* skip the leading '.' */ - cpp_skip_hspace(&p); + p++; /* skip the leading '.' */ + cpp_skip_hspace(&p); - /* Parse the name of the directive, such as 'if', 'elif', 'endif'. */ - if (p[0] == 'e') { - if (p[1] != 'l') { - if (!is_token(p + 1, "ndif", 4)) { - /* Unknown directive. It might still be a transformation - * rule like '.elisp.scm', therefore no error message here. */ - return COND_INVALID; - } + if (IsEndif(p)) { /* It is an '.endif'. */ + if (p[5] != '\0') { + Parse_Error(PARSE_FATAL, + "The .endif directive does not take arguments."); + } - /* It is an '.endif'. */ - /* TODO: check for extraneous */ + if (cond_depth == cond_min_depth) { + Parse_Error(PARSE_FATAL, "if-less endif"); + return COND_PARSE; + } - if (cond_depth == cond_min_depth) { - Parse_Error(PARSE_FATAL, "if-less endif"); - return COND_PARSE; - } + /* Return state for previous conditional */ + cond_depth--; + return cond_states[cond_depth] & IFS_ACTIVE + ? COND_PARSE : COND_SKIP; + } - /* Return state for previous conditional */ - cond_depth--; - return cond_states[cond_depth] & IFS_ACTIVE - ? COND_PARSE : COND_SKIP; + /* Parse the name of the directive, such as 'if', 'elif', 'endif'. */ + if (p[0] == 'e') { + if (p[1] != 'l') { + /* + * Unknown directive. It might still be a + * transformation rule like '.elisp.scm', + * therefore no error message here. + */ + return COND_INVALID; + } + + /* Quite likely this is 'else' or 'elif' */ + p += 2; + if (is_token(p, "se", 2)) { /* It is an 'else'. */ + + if (p[2] != '\0') + Parse_Error(PARSE_FATAL, + "The .else directive " + "does not take arguments."); + + if (cond_depth == cond_min_depth) { + Parse_Error(PARSE_FATAL, "if-less else"); + return COND_PARSE; + } + + state = cond_states[cond_depth]; + if (state == IFS_INITIAL) { + state = IFS_ACTIVE | IFS_SEEN_ELSE; + } else { + if (state & IFS_SEEN_ELSE) + Parse_Error(PARSE_WARNING, + "extra else"); + state = IFS_WAS_ACTIVE | IFS_SEEN_ELSE; + } + cond_states[cond_depth] = state; + + return state & IFS_ACTIVE ? COND_PARSE : COND_SKIP; + } + /* Assume for now it is an elif */ + isElif = TRUE; + } else + isElif = FALSE; + + if (p[0] != 'i' || p[1] != 'f') { + /* + * Unknown directive. It might still be a transformation rule + * like '.elisp.scm', therefore no error message here. + */ + return COND_INVALID; /* Not an ifxxx or elifxxx line */ } - /* Quite likely this is 'else' or 'elif' */ + /* + * Figure out what sort of conditional it is -- what its default + * function is, etc. -- by looking in the table of valid "ifs" + */ p += 2; - if (is_token(p, "se", 2)) { /* It is an 'else'. */ - - if (opts.lint && p[2] != '\0') - Parse_Error(PARSE_FATAL, - "The .else directive does not take arguments."); - - if (cond_depth == cond_min_depth) { - Parse_Error(PARSE_FATAL, "if-less else"); - return COND_PARSE; - } - - state = cond_states[cond_depth]; - if (state == IFS_INITIAL) { - state = IFS_ACTIVE | IFS_SEEN_ELSE; - } else { - if (state & IFS_SEEN_ELSE) - Parse_Error(PARSE_WARNING, "extra else"); - state = IFS_WAS_ACTIVE | IFS_SEEN_ELSE; - } - cond_states[cond_depth] = state; - - return state & IFS_ACTIVE ? COND_PARSE : COND_SKIP; - } - /* Assume for now it is an elif */ - isElif = TRUE; - } else - isElif = FALSE; - - if (p[0] != 'i' || p[1] != 'f') { - /* Unknown directive. It might still be a transformation rule like - * '.elisp.scm', therefore no error message here. */ - return COND_INVALID; /* Not an ifxxx or elifxxx line */ - } - - /* - * Figure out what sort of conditional it is -- what its default - * function is, etc. -- by looking in the table of valid "ifs" - */ - p += 2; - for (ifp = ifs;; ifp++) { - if (ifp->form == NULL) { - /* TODO: Add error message about unknown directive, - * since there is no other known directive that starts with 'el' - * or 'if'. - * Example: .elifx 123 */ - return COND_INVALID; - } - if (is_token(p, ifp->form, ifp->formlen)) { - p += ifp->formlen; - break; + for (ifp = ifs;; ifp++) { + if (ifp->form == NULL) { + /* + * TODO: Add error message about unknown directive, + * since there is no other known directive that starts + * with 'el' or 'if'. + * + * Example: .elifx 123 + */ + return COND_INVALID; + } + if (is_token(p, ifp->form, ifp->formlen)) { + p += ifp->formlen; + break; + } } - } - /* Now we know what sort of 'if' it is... */ + /* Now we know what sort of 'if' it is... */ - if (isElif) { - if (cond_depth == cond_min_depth) { - Parse_Error(PARSE_FATAL, "if-less elif"); - return COND_PARSE; - } - state = cond_states[cond_depth]; - if (state & IFS_SEEN_ELSE) { - Parse_Error(PARSE_WARNING, "extra elif"); - cond_states[cond_depth] = IFS_WAS_ACTIVE | IFS_SEEN_ELSE; - return COND_SKIP; - } - if (state != IFS_INITIAL) { - cond_states[cond_depth] = IFS_WAS_ACTIVE; - return COND_SKIP; + if (isElif) { + if (cond_depth == cond_min_depth) { + Parse_Error(PARSE_FATAL, "if-less elif"); + return COND_PARSE; + } + state = cond_states[cond_depth]; + if (state & IFS_SEEN_ELSE) { + Parse_Error(PARSE_WARNING, "extra elif"); + cond_states[cond_depth] = + IFS_WAS_ACTIVE | IFS_SEEN_ELSE; + return COND_SKIP; + } + if (state != IFS_INITIAL) { + cond_states[cond_depth] = IFS_WAS_ACTIVE; + return COND_SKIP; + } + } else { + /* Normal .if */ + if (cond_depth + 1 >= cond_states_cap) { + /* + * This is rare, but not impossible. + * In meta mode, dirdeps.mk (only runs at level 0) + * can need more than the default. + */ + cond_states_cap += 32; + cond_states = bmake_realloc(cond_states, + cond_states_cap * + sizeof *cond_states); + } + state = cond_states[cond_depth]; + cond_depth++; + if (!(state & IFS_ACTIVE)) { + /* + * If we aren't parsing the data, + * treat as always false. + */ + cond_states[cond_depth] = IFS_WAS_ACTIVE; + return COND_SKIP; + } } - } else { - /* Normal .if */ - if (cond_depth + 1 >= cond_states_cap) { - /* - * This is rare, but not impossible. - * In meta mode, dirdeps.mk (only runs at level 0) - * can need more than the default. - */ - cond_states_cap += 32; - cond_states = bmake_realloc(cond_states, - cond_states_cap * sizeof *cond_states); + + /* And evaluate the conditional expression */ + if (CondEvalExpression(ifp, p, &value, TRUE, TRUE) == COND_INVALID) { + /* Syntax error in conditional, error message already output. */ + /* Skip everything to matching .endif */ + /* XXX: An extra '.else' is not detected in this case. */ + cond_states[cond_depth] = IFS_WAS_ACTIVE; + return COND_SKIP; } - state = cond_states[cond_depth]; - cond_depth++; - if (!(state & IFS_ACTIVE)) { - /* If we aren't parsing the data, treat as always false */ - cond_states[cond_depth] = IFS_WAS_ACTIVE; - return COND_SKIP; + + if (!value) { + cond_states[cond_depth] = IFS_INITIAL; + return COND_SKIP; } - } - - /* And evaluate the conditional expression */ - if (CondEvalExpression(ifp, p, &value, TRUE, TRUE) == COND_INVALID) { - /* Syntax error in conditional, error message already output. */ - /* Skip everything to matching .endif */ - /* XXX: An extra '.else' is not detected in this case. */ - cond_states[cond_depth] = IFS_WAS_ACTIVE; - return COND_SKIP; - } - - if (!value) { - cond_states[cond_depth] = IFS_INITIAL; - return COND_SKIP; - } - cond_states[cond_depth] = IFS_ACTIVE; - return COND_PARSE; + cond_states[cond_depth] = IFS_ACTIVE; + return COND_PARSE; } void Cond_restore_depth(unsigned int saved_depth) { - unsigned int open_conds = cond_depth - cond_min_depth; + unsigned int open_conds = cond_depth - cond_min_depth; - if (open_conds != 0 || saved_depth > cond_depth) { - Parse_Error(PARSE_FATAL, "%u open conditional%s", open_conds, - open_conds == 1 ? "" : "s"); - cond_depth = cond_min_depth; - } + if (open_conds != 0 || saved_depth > cond_depth) { + Parse_Error(PARSE_FATAL, "%u open conditional%s", + open_conds, open_conds == 1 ? "" : "s"); + cond_depth = cond_min_depth; + } - cond_min_depth = saved_depth; + cond_min_depth = saved_depth; } unsigned int Cond_save_depth(void) { - unsigned int depth = cond_min_depth; + unsigned int depth = cond_min_depth; - cond_min_depth = cond_depth; - return depth; + cond_min_depth = cond_depth; + return depth; } diff --git a/dir.c b/dir.c index 359e61adb669..230b66b3baf3 100644 --- a/dir.c +++ b/dir.c @@ -1,1555 +1,1696 @@ -/* $NetBSD: dir.c,v 1.210 2020/11/14 21:29:44 rillig Exp $ */ +/* $NetBSD: dir.c,v 1.255 2021/01/10 21:20:46 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* Directory searching using wildcards and/or normal names. +/* + * Directory searching using wildcards and/or normal names. * Used both for source wildcarding in the makefile and for finding * implicit sources. * * The interface for this module is: * Dir_Init Initialize the module. * * Dir_InitCur Set the cur CachedDir. * * Dir_InitDot Set the dot CachedDir. * * Dir_End Clean up the module. * * Dir_SetPATH Set ${.PATH} to reflect state of dirSearchPath. * * Dir_HasWildcards * Returns TRUE if the name given it needs to * be wildcard-expanded. * * Dir_Expand Given a pattern and a path, return a Lst of names * which match the pattern on the search path. * * Dir_FindFile Searches for a file on a given search path. * If it exists, the entire path is returned. * Otherwise NULL is returned. * * Dir_FindHereOrAbove * Search for a path in the current directory and * then all the directories above it in turn until * the path is found or we reach the root ("/"). * * Dir_UpdateMTime * Update the modification time and path of a node with * data from the file corresponding to the node. * * Dir_AddDir Add a directory to a search path. * - * Dir_MakeFlags Given a search path and a command flag, create + * SearchPath_ToFlags + * Given a search path and a command flag, create * a string with each of the directories in the path * preceded by the command flag and all of them * separated by a space. * * Dir_Destroy Destroy an element of a search path. Frees up all * things that can be freed for the element as long * as the element is no longer referenced by any other * search path. * - * Dir_ClearPath Resets a search path to the empty list. + * SearchPath_Clear + * Resets a search path to the empty list. * * For debugging: * Dir_PrintDirectories * Print stats about the directory cache. */ #include #include #include #include #include "make.h" #include "dir.h" #include "job.h" /* "@(#)dir.c 8.2 (Berkeley) 1/2/94" */ -MAKE_RCSID("$NetBSD: dir.c,v 1.210 2020/11/14 21:29:44 rillig Exp $"); - -#define DIR_DEBUG0(text) DEBUG0(DIR, text) -#define DIR_DEBUG1(fmt, arg1) DEBUG1(DIR, fmt, arg1) -#define DIR_DEBUG2(fmt, arg1, arg2) DEBUG2(DIR, fmt, arg1, arg2) +MAKE_RCSID("$NetBSD: dir.c,v 1.255 2021/01/10 21:20:46 rillig Exp $"); -/* A search path is a list of CachedDir structures. A CachedDir has in it the +/* + * A search path is a list of CachedDir structures. A CachedDir has in it the * name of the directory and the names of all the files in the directory. * This is used to cut down on the number of system calls necessary to find * implicit dependents and their like. Since these searches are made before * any actions are taken, we need not worry about the directory changing due * to creation commands. If this hampers the style of some makefiles, they * must be changed. * * All previously-read directories are kept in openDirs, which is checked * first before a directory is opened. * * The need for the caching of whole directories is brought about by the * multi-level transformation code in suff.c, which tends to search for far * more files than regular make does. In the initial implementation, the * amount of time spent performing "stat" calls was truly astronomical. * The problem with caching at the start is, of course, that pmake doesn't * then detect changes to these directories during the course of the make. * Three possibilities suggest themselves: * * 1) just use stat to test for a file's existence. As mentioned above, * this is very inefficient due to the number of checks engendered by * the multi-level transformation code. * * 2) use readdir() and company to search the directories, keeping them * open between checks. I have tried this and while it didn't slow down * the process too much, it could severely affect the amount of * parallelism available as each directory open would take another file * descriptor out of play for handling I/O for another job. Given that * it is only recently (as of 1993 or earlier) that UNIX OS's have taken * to allowing more than 20 or 32 file descriptors for a process, this * doesn't seem acceptable to me. * * 3) record the mtime of the directory in the CachedDir structure and * verify the directory hasn't changed since the contents were cached. * This will catch the creation or deletion of files, but not the * updating of files. However, since it is the creation and deletion * that is the problem, this could be a good thing to do. Unfortunately, * if the directory (say ".") were fairly large and changed fairly * frequently, the constant reloading could seriously degrade * performance. It might be good in such cases to keep track of the * number of reloadings and if the number goes over a (small) limit, * resort to using stat in its place. * * An additional thing to consider is that pmake is used primarily to create * C programs and until recently (as of 1993 or earlier) pcc-based compilers * refused to allow you to specify where the resulting object file should be * placed. This forced all objects to be created in the current directory. * This isn't meant as a full excuse, just an explanation of some of the * reasons for the caching used here. * * One more note: the location of a target's file is only performed on the * downward traversal of the graph and then only for terminal nodes in the * graph. This could be construed as wrong in some cases, but prevents * inadvertent modification of files when the "installed" directory for a * file is provided in the search path. * * Another data structure maintained by this module is an mtime cache used * when the searching of cached directories fails to find a file. In the past, * Dir_FindFile would simply perform an access() call in such a case to * determine if the file could be found using just the name given. When this * hit, however, all that was gained was the knowledge that the file existed. * Given that an access() is essentially a stat() without the copyout() call, * and that the same filesystem overhead would have to be incurred in * Dir_MTime, it made sense to replace the access() with a stat() and record * the mtime in a cache for when Dir_UpdateMTime was actually called. */ + +/* A cache for the filenames in a directory. */ +struct CachedDir { + /* + * Name of directory, either absolute or relative to the current + * directory. The name is not normalized in any way, that is, "." + * and "./." are different. + * + * Not sure what happens when .CURDIR is assigned a new value; see + * Parse_DoVar. + */ + char *name; + + /* + * The number of SearchPaths that refer to this directory. + * Plus the number of global variables that refer to this directory. + * References from openDirs do not count though. + */ + int refCount; + + /* The number of times a file in this directory has been found. */ + int hits; + + /* The names of the directory entries. */ + HashSet files; +}; + typedef List CachedDirList; typedef ListNode CachedDirListNode; typedef ListNode SearchPathNode; -SearchPath *dirSearchPath; /* main search path */ - /* A list of cached directories, with fast lookup by directory name. */ typedef struct OpenDirs { - CachedDirList *list; - HashTable /* of CachedDirListNode */ table; + CachedDirList list; + HashTable /* of CachedDirListNode */ table; } OpenDirs; +typedef enum CachedStatsFlags { + CST_NONE = 0, + CST_LSTAT = 1 << 0, /* call lstat(2) instead of stat(2) */ + CST_UPDATE = 1 << 1 /* ignore existing cached entry */ +} CachedStatsFlags; + + +SearchPath dirSearchPath = LST_INIT; /* main search path */ + +static OpenDirs openDirs; /* all cached directories */ + +/* + * Variables for gathering statistics on the efficiency of the caching + * mechanism. + */ +static int hits; /* Found in directory cache */ +static int misses; /* Sad, but not evil misses */ +static int nearmisses; /* Found under search path */ +static int bigmisses; /* Sought by itself */ + +/* The cached contents of ".", the relative current directory. */ +static CachedDir *dot = NULL; +/* The cached contents of the absolute current directory. */ +static CachedDir *cur = NULL; +/* A fake path entry indicating we need to look for '.' last. */ +static CachedDir *dotLast = NULL; + +/* + * Results of doing a last-resort stat in Dir_FindFile -- if we have to go to + * the system to find the file, we might as well have its mtime on record. + * + * XXX: If this is done way early, there's a chance other rules will have + * already updated the file, in which case we'll update it again. Generally, + * there won't be two rules to update a single file, so this should be ok, + * but... + */ +static HashTable mtimes; + +static HashTable lmtimes; /* same as mtimes but for lstat */ + + +static void OpenDirs_Remove(OpenDirs *, const char *); + + +static CachedDir * +CachedDir_New(const char *name) +{ + CachedDir *dir = bmake_malloc(sizeof *dir); + + dir->name = bmake_strdup(name); + dir->refCount = 0; + dir->hits = 0; + HashSet_Init(&dir->files); + +#ifdef DEBUG_REFCNT + DEBUG2(DIR, "CachedDir %p new for \"%s\"\n", dir, dir->name); +#endif + + return dir; +} + +static CachedDir * +CachedDir_Ref(CachedDir *dir) +{ + dir->refCount++; + +#ifdef DEBUG_REFCNT + DEBUG3(DIR, "CachedDir %p ++ %d for \"%s\"\n", + dir, dir->refCount, dir->name); +#endif + + return dir; +} + +static void +CachedDir_Unref(CachedDir *dir) +{ + dir->refCount--; + +#ifdef DEBUG_REFCNT + DEBUG3(DIR, "CachedDir %p -- %d for \"%s\"\n", + dir, dir->refCount, dir->name); +#endif + + if (dir->refCount > 0) + return; + +#ifdef DEBUG_REFCNT + DEBUG2(DIR, "CachedDir %p free for \"%s\"\n", dir, dir->name); +#endif + + OpenDirs_Remove(&openDirs, dir->name); + + free(dir->name); + HashSet_Done(&dir->files); + free(dir); +} + +/* Update the value of the CachedDir variable, updating the reference counts. */ +static void +CachedDir_Assign(CachedDir **var, CachedDir *dir) +{ + CachedDir *prev; + + prev = *var; + *var = dir; + if (dir != NULL) + CachedDir_Ref(dir); + if (prev != NULL) + CachedDir_Unref(prev); +} + static void OpenDirs_Init(OpenDirs *odirs) { - odirs->list = Lst_New(); - HashTable_Init(&odirs->table); + Lst_Init(&odirs->list); + HashTable_Init(&odirs->table); } #ifdef CLEANUP static void OpenDirs_Done(OpenDirs *odirs) { - CachedDirListNode *ln = odirs->list->first; - while (ln != NULL) { - CachedDirListNode *next = ln->next; - CachedDir *dir = ln->datum; - Dir_Destroy(dir); /* removes the dir from odirs->list */ - ln = next; - } - Lst_Free(odirs->list); - HashTable_Done(&odirs->table); + CachedDirListNode *ln = odirs->list.first; + DEBUG1(DIR, "OpenDirs_Done: %u entries to remove\n", + odirs->table.numEntries); + while (ln != NULL) { + CachedDirListNode *next = ln->next; + CachedDir *dir = ln->datum; + DEBUG2(DIR, "OpenDirs_Done: refCount %d for \"%s\"\n", + dir->refCount, dir->name); + CachedDir_Unref(dir); /* removes the dir from odirs->list */ + ln = next; + } + Lst_Done(&odirs->list); + HashTable_Done(&odirs->table); } #endif static CachedDir * OpenDirs_Find(OpenDirs *odirs, const char *name) { - CachedDirListNode *ln = HashTable_FindValue(&odirs->table, name); - return ln != NULL ? ln->datum : NULL; + CachedDirListNode *ln = HashTable_FindValue(&odirs->table, name); + return ln != NULL ? ln->datum : NULL; } static void OpenDirs_Add(OpenDirs *odirs, CachedDir *cdir) { - if (HashTable_FindEntry(&odirs->table, cdir->name) != NULL) - return; - Lst_Append(odirs->list, cdir); - HashTable_Set(&odirs->table, cdir->name, odirs->list->last); + if (HashTable_FindEntry(&odirs->table, cdir->name) != NULL) + return; + Lst_Append(&odirs->list, cdir); + HashTable_Set(&odirs->table, cdir->name, odirs->list.last); } static void OpenDirs_Remove(OpenDirs *odirs, const char *name) { - HashEntry *he = HashTable_FindEntry(&odirs->table, name); - CachedDirListNode *ln; - if (he == NULL) - return; - ln = HashEntry_Get(he); - HashTable_DeleteEntry(&odirs->table, he); - Lst_Remove(odirs->list, ln); + HashEntry *he = HashTable_FindEntry(&odirs->table, name); + CachedDirListNode *ln; + if (he == NULL) + return; + ln = HashEntry_Get(he); + HashTable_DeleteEntry(&odirs->table, he); + Lst_Remove(&odirs->list, ln); } -static OpenDirs openDirs; /* all cached directories */ - /* - * Variables for gathering statistics on the efficiency of the caching - * mechanism. + * Returns 0 and the result of stat(2) or lstat(2) in *out_cst, + * or -1 on error. */ -static int hits; /* Found in directory cache */ -static int misses; /* Sad, but not evil misses */ -static int nearmisses; /* Found under search path */ -static int bigmisses; /* Sought by itself */ - -static CachedDir *dot; /* contents of current directory */ -static CachedDir *cur; /* contents of current directory, if not dot */ -static CachedDir *dotLast; /* a fake path entry indicating we need to - * look for . last */ - -/* Results of doing a last-resort stat in Dir_FindFile -- if we have to go to - * the system to find the file, we might as well have its mtime on record. - * - * XXX: If this is done way early, there's a chance other rules will have - * already updated the file, in which case we'll update it again. Generally, - * there won't be two rules to update a single file, so this should be ok, - * but... */ -static HashTable mtimes; - -static HashTable lmtimes; /* same as mtimes but for lstat */ - -typedef enum CachedStatsFlags { - CST_NONE = 0, - CST_LSTAT = 1 << 0, /* call lstat(2) instead of stat(2) */ - CST_UPDATE = 1 << 1 /* ignore existing cached entry */ -} CachedStatsFlags; - -/* Returns 0 and the result of stat(2) or lstat(2) in *out_cst, - * or -1 on error. */ static int cached_stats(const char *pathname, struct cached_stat *out_cst, CachedStatsFlags flags) { - HashTable *tbl = flags & CST_LSTAT ? &lmtimes : &mtimes; - struct stat sys_st; - struct cached_stat *cst; - int rc; - - if (pathname == NULL || pathname[0] == '\0') - return -1; /* This can happen in meta mode. */ - - cst = HashTable_FindValue(tbl, pathname); - if (cst != NULL && !(flags & CST_UPDATE)) { - *out_cst = *cst; - DIR_DEBUG2("Using cached time %s for %s\n", - Targ_FmtTime(cst->cst_mtime), pathname); - return 0; - } + HashTable *tbl = flags & CST_LSTAT ? &lmtimes : &mtimes; + struct stat sys_st; + struct cached_stat *cst; + int rc; + + if (pathname == NULL || pathname[0] == '\0') + return -1; /* This can happen in meta mode. */ + + cst = HashTable_FindValue(tbl, pathname); + if (cst != NULL && !(flags & CST_UPDATE)) { + *out_cst = *cst; + DEBUG2(DIR, "Using cached time %s for %s\n", + Targ_FmtTime(cst->cst_mtime), pathname); + return 0; + } - rc = (flags & CST_LSTAT ? lstat : stat)(pathname, &sys_st); - if (rc == -1) - return -1; /* don't cache negative lookups */ + rc = (flags & CST_LSTAT ? lstat : stat)(pathname, &sys_st); + if (rc == -1) + return -1; /* don't cache negative lookups */ - if (sys_st.st_mtime == 0) - sys_st.st_mtime = 1; /* avoid confusion with missing file */ + if (sys_st.st_mtime == 0) + sys_st.st_mtime = 1; /* avoid confusion with missing file */ - if (cst == NULL) { - cst = bmake_malloc(sizeof *cst); - HashTable_Set(tbl, pathname, cst); - } + if (cst == NULL) { + cst = bmake_malloc(sizeof *cst); + HashTable_Set(tbl, pathname, cst); + } - cst->cst_mtime = sys_st.st_mtime; - cst->cst_mode = sys_st.st_mode; + cst->cst_mtime = sys_st.st_mtime; + cst->cst_mode = sys_st.st_mode; - *out_cst = *cst; - DIR_DEBUG2(" Caching %s for %s\n", - Targ_FmtTime(sys_st.st_mtime), pathname); + *out_cst = *cst; + DEBUG2(DIR, " Caching %s for %s\n", + Targ_FmtTime(sys_st.st_mtime), pathname); - return 0; + return 0; } int cached_stat(const char *pathname, struct cached_stat *cst) { - return cached_stats(pathname, cst, CST_NONE); + return cached_stats(pathname, cst, CST_NONE); } int cached_lstat(const char *pathname, struct cached_stat *cst) { - return cached_stats(pathname, cst, CST_LSTAT); + return cached_stats(pathname, cst, CST_LSTAT); } /* Initialize the directories module. */ void Dir_Init(void) { - dirSearchPath = Lst_New(); - OpenDirs_Init(&openDirs); - HashTable_Init(&mtimes); - HashTable_Init(&lmtimes); -} - -void -Dir_InitDir(const char *cdname) -{ - Dir_InitCur(cdname); - - dotLast = bmake_malloc(sizeof *dotLast); - dotLast->refCount = 1; - dotLast->hits = 0; - dotLast->name = bmake_strdup(".DOTLAST"); - HashTable_Init(&dotLast->files); + OpenDirs_Init(&openDirs); + HashTable_Init(&mtimes); + HashTable_Init(&lmtimes); + CachedDir_Assign(&dotLast, CachedDir_New(".DOTLAST")); } /* * Called by Dir_InitDir and whenever .CURDIR is assigned to. */ void Dir_InitCur(const char *cdname) { - CachedDir *dir; - - if (cdname == NULL) - return; - - /* - * Our build directory is not the same as our source directory. - * Keep this one around too. - */ - dir = Dir_AddDir(NULL, cdname); - if (dir == NULL) - return; - - /* XXX: Reference counting is wrong here. - * If this function is called repeatedly with the same directory name, - * its reference count increases each time even though the number of - * actual references stays the same. */ - - dir->refCount++; - if (cur != NULL && cur != dir) { + CachedDir *dir; + + if (cdname == NULL) + return; + /* - * We've been here before, clean up. + * Our build directory is not the same as our source directory. + * Keep this one around too. */ - cur->refCount--; - Dir_Destroy(cur); - } - cur = dir; + dir = Dir_AddDir(NULL, cdname); + if (dir == NULL) + return; + + CachedDir_Assign(&cur, dir); } -/* (Re)initialize "dot" (current/object directory) path hash. - * Some directories may be opened. */ +/* + * (Re)initialize "dot" (current/object directory) path hash. + * Some directories may be cached. + */ void Dir_InitDot(void) { - if (dot != NULL) { - /* Remove old entry from openDirs, but do not destroy. */ - OpenDirs_Remove(&openDirs, dot->name); - } - - dot = Dir_AddDir(NULL, "."); - - if (dot == NULL) { - Error("Cannot open `.' (%s)", strerror(errno)); - exit(1); - } - - /* - * We always need to have dot around, so we increment its reference count - * to make sure it's not destroyed. - */ - dot->refCount++; - Dir_SetPATH(); /* initialize */ + CachedDir *dir; + + dir = Dir_AddDir(NULL, "."); + if (dir == NULL) { + Error("Cannot open `.' (%s)", strerror(errno)); + exit(2); /* Not 1 so -q can distinguish error */ + } + + CachedDir_Assign(&dot, dir); + + Dir_SetPATH(); /* initialize */ } /* Clean up the directories module. */ void Dir_End(void) { #ifdef CLEANUP - if (cur) { - cur->refCount--; - Dir_Destroy(cur); - } - dot->refCount--; - dotLast->refCount--; - Dir_Destroy(dotLast); - Dir_Destroy(dot); - Dir_ClearPath(dirSearchPath); - Lst_Free(dirSearchPath); - OpenDirs_Done(&openDirs); - HashTable_Done(&mtimes); + CachedDir_Assign(&cur, NULL); + CachedDir_Assign(&dot, NULL); + CachedDir_Assign(&dotLast, NULL); + SearchPath_Clear(&dirSearchPath); + OpenDirs_Done(&openDirs); + HashTable_Done(&mtimes); + HashTable_Done(&lmtimes); #endif } /* * We want ${.PATH} to indicate the order in which we will actually * search, so we rebuild it after any .PATH: target. * This is the simplest way to deal with the effect of .DOTLAST. */ void Dir_SetPATH(void) { - CachedDirListNode *ln; - Boolean hasLastDot = FALSE; /* true if we should search dot last */ + CachedDirListNode *ln; + Boolean seenDotLast = FALSE; /* true if we should search '.' last */ + + Var_Delete(".PATH", VAR_GLOBAL); + + if ((ln = dirSearchPath.first) != NULL) { + CachedDir *dir = ln->datum; + if (dir == dotLast) { + seenDotLast = TRUE; + Var_Append(".PATH", dotLast->name, VAR_GLOBAL); + } + } + + if (!seenDotLast) { + if (dot != NULL) + Var_Append(".PATH", dot->name, VAR_GLOBAL); + if (cur != NULL) + Var_Append(".PATH", cur->name, VAR_GLOBAL); + } - Var_Delete(".PATH", VAR_GLOBAL); + for (ln = dirSearchPath.first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + if (dir == dotLast) + continue; + if (dir == dot && seenDotLast) + continue; + Var_Append(".PATH", dir->name, VAR_GLOBAL); + } - if ((ln = dirSearchPath->first) != NULL) { - CachedDir *dir = ln->datum; - if (dir == dotLast) { - hasLastDot = TRUE; - Var_Append(".PATH", dotLast->name, VAR_GLOBAL); + if (seenDotLast) { + if (dot != NULL) + Var_Append(".PATH", dot->name, VAR_GLOBAL); + if (cur != NULL) + Var_Append(".PATH", cur->name, VAR_GLOBAL); } - } - - if (!hasLastDot) { - if (dot) - Var_Append(".PATH", dot->name, VAR_GLOBAL); - if (cur) - Var_Append(".PATH", cur->name, VAR_GLOBAL); - } - - for (ln = dirSearchPath->first; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - if (dir == dotLast) - continue; - if (dir == dot && hasLastDot) - continue; - Var_Append(".PATH", dir->name, VAR_GLOBAL); - } - - if (hasLastDot) { - if (dot) - Var_Append(".PATH", dot->name, VAR_GLOBAL); - if (cur) - Var_Append(".PATH", cur->name, VAR_GLOBAL); - } } -/* See if the given name has any wildcard characters in it and all braces and +/* + * See if the given name has any wildcard characters in it and all braces and * brackets are properly balanced. * * XXX: This code is not 100% correct ([^]] fails etc.). I really don't think * that make(1) should be expanding patterns, because then you have to set a * mechanism for escaping the expansion! * * Return TRUE if the word should be expanded, FALSE otherwise. */ Boolean Dir_HasWildcards(const char *name) { - const char *p; - Boolean wild = FALSE; - int braces = 0, brackets = 0; - - for (p = name; *p != '\0'; p++) { - switch (*p) { - case '{': - braces++; - wild = TRUE; - break; - case '}': - braces--; - break; - case '[': - brackets++; - wild = TRUE; - break; - case ']': - brackets--; - break; - case '?': - case '*': - wild = TRUE; - break; - default: - break; + const char *p; + Boolean wild = FALSE; + int braces = 0, brackets = 0; + + for (p = name; *p != '\0'; p++) { + switch (*p) { + case '{': + braces++; + wild = TRUE; + break; + case '}': + braces--; + break; + case '[': + brackets++; + wild = TRUE; + break; + case ']': + brackets--; + break; + case '?': + case '*': + wild = TRUE; + break; + default: + break; + } } - } - return wild && brackets == 0 && braces == 0; + return wild && brackets == 0 && braces == 0; } -/* See if any files match the pattern and add their names to the 'expansions' +/* + * See if any files match the pattern and add their names to the 'expansions' * list if they do. * * This is incomplete -- wildcards are only expanded in the final path * component, but not in directories like src/lib*c/file*.c, but it * will do for now (now being 1993 until at least 2020). To expand these, * use the ':sh' variable modifier such as in ${:!echo src/lib*c/file*.c!}. * * Input: * pattern Pattern to look for * dir Directory to search * expansion Place to store the results */ static void DirMatchFiles(const char *pattern, CachedDir *dir, StringList *expansions) { - const char *dirName = dir->name; - Boolean isDot = dirName[0] == '.' && dirName[1] == '\0'; - HashIter hi; - - /* XXX: Iterating over all hash entries is inefficient. If the pattern - * is a plain string without any wildcards, a direct lookup is faster. */ - - HashIter_Init(&hi, &dir->files); - while (HashIter_Next(&hi) != NULL) { - const char *base = hi.entry->key; - - if (!Str_Match(base, pattern)) - continue; + const char *dirName = dir->name; + Boolean isDot = dirName[0] == '.' && dirName[1] == '\0'; + HashIter hi; /* - * Follow the UNIX convention that dot files are only found if the - * pattern begins with a dot. The pattern '.*' does not match '.' or - * '..' since these are not included in the directory cache. - * - * This means that the pattern '[a-z.]*' does not find '.file', which - * is consistent with bash, NetBSD sh and csh. + * XXX: Iterating over all hash entries is inefficient. If the + * pattern is a plain string without any wildcards, a direct lookup + * is faster. */ - if (base[0] == '.' && pattern[0] != '.') - continue; - { - char *fullName = isDot - ? bmake_strdup(base) - : str_concat3(dirName, "/", base); - Lst_Append(expansions, fullName); + HashIter_InitSet(&hi, &dir->files); + while (HashIter_Next(&hi) != NULL) { + const char *base = hi.entry->key; + + if (!Str_Match(base, pattern)) + continue; + + /* + * Follow the UNIX convention that dot files are only found + * if the pattern begins with a dot. The pattern '.*' does + * not match '.' or '..' since these are not included in the + * directory cache. + * + * This means that the pattern '[a-z.]*' does not find + * '.file', which is consistent with bash, NetBSD sh and csh. + */ + if (base[0] == '.' && pattern[0] != '.') + continue; + + { + char *fullName = isDot + ? bmake_strdup(base) + : str_concat3(dirName, "/", base); + Lst_Append(expansions, fullName); + } } - } } -/* Find the next closing brace in the string, taking nested braces into - * account. */ +/* + * Find the next closing brace in the string, taking nested braces into + * account. + */ static const char * closing_brace(const char *p) { - int nest = 0; - while (*p != '\0') { - if (*p == '}' && nest == 0) - break; - if (*p == '{') - nest++; - if (*p == '}') - nest--; - p++; - } - return p; + int nest = 0; + while (*p != '\0') { + if (*p == '}' && nest == 0) + break; + if (*p == '{') + nest++; + if (*p == '}') + nest--; + p++; + } + return p; } -/* Find the next closing brace or comma in the string, taking nested braces - * into account. */ +/* + * Find the next closing brace or comma in the string, taking nested braces + * into account. + */ static const char * separator_comma(const char *p) { - int nest = 0; - while (*p != '\0') { - if ((*p == '}' || *p == ',') && nest == 0) - break; - if (*p == '{') - nest++; - if (*p == '}') - nest--; - p++; - } - return p; + int nest = 0; + while (*p != '\0') { + if ((*p == '}' || *p == ',') && nest == 0) + break; + if (*p == '{') + nest++; + if (*p == '}') + nest--; + p++; + } + return p; } static Boolean contains_wildcard(const char *p) { - for (; *p != '\0'; p++) { - switch (*p) { - case '*': - case '?': - case '{': - case '[': - return TRUE; + for (; *p != '\0'; p++) { + switch (*p) { + case '*': + case '?': + case '{': + case '[': + return TRUE; + } } - } - return FALSE; + return FALSE; } static char * concat3(const char *a, size_t a_len, const char *b, size_t b_len, const char *c, size_t c_len) { - size_t s_len = a_len + b_len + c_len; - char *s = bmake_malloc(s_len + 1); - memcpy(s, a, a_len); - memcpy(s + a_len, b, b_len); - memcpy(s + a_len + b_len, c, c_len); - s[s_len] = '\0'; - return s; + size_t s_len = a_len + b_len + c_len; + char *s = bmake_malloc(s_len + 1); + memcpy(s, a, a_len); + memcpy(s + a_len, b, b_len); + memcpy(s + a_len + b_len, c, c_len); + s[s_len] = '\0'; + return s; } -/* Expand curly braces like the C shell. Brace expansion by itself is purely +/* + * Expand curly braces like the C shell. Brace expansion by itself is purely * textual, the expansions are not looked up in the file system. But if an * expanded word contains wildcard characters, it is expanded further, * matching only the actually existing files. * * Example: "{a{b,c}}" expands to "ab" and "ac". * Example: "{a}" expands to "a". * Example: "{a,*.c}" expands to "a" and all "*.c" files that exist. * * Input: * word Entire word to expand * brace First curly brace in it * path Search path to use * expansions Place to store the expansions */ static void DirExpandCurly(const char *word, const char *brace, SearchPath *path, StringList *expansions) { - const char *prefix, *middle, *piece, *middle_end, *suffix; - size_t prefix_len, suffix_len; - - /* Split the word into prefix '{' middle '}' suffix. */ - - middle = brace + 1; - middle_end = closing_brace(middle); - if (*middle_end == '\0') { - Error("Unterminated {} clause \"%s\"", middle); - return; - } - - prefix = word; - prefix_len = (size_t)(brace - prefix); - suffix = middle_end + 1; - suffix_len = strlen(suffix); - - /* Split the middle into pieces, separated by commas. */ - - piece = middle; - while (piece < middle_end + 1) { - const char *piece_end = separator_comma(piece); - size_t piece_len = (size_t)(piece_end - piece); - - char *file = concat3(prefix, prefix_len, piece, piece_len, - suffix, suffix_len); - - if (contains_wildcard(file)) { - Dir_Expand(file, path, expansions); - free(file); - } else { - Lst_Append(expansions, file); + const char *prefix, *middle, *piece, *middle_end, *suffix; + size_t prefix_len, suffix_len; + + /* Split the word into prefix '{' middle '}' suffix. */ + + middle = brace + 1; + middle_end = closing_brace(middle); + if (*middle_end == '\0') { + Error("Unterminated {} clause \"%s\"", middle); + return; } - piece = piece_end + 1; /* skip over the comma or closing brace */ - } + prefix = word; + prefix_len = (size_t)(brace - prefix); + suffix = middle_end + 1; + suffix_len = strlen(suffix); + + /* Split the middle into pieces, separated by commas. */ + + piece = middle; + while (piece < middle_end + 1) { + const char *piece_end = separator_comma(piece); + size_t piece_len = (size_t)(piece_end - piece); + + char *file = concat3(prefix, prefix_len, piece, piece_len, + suffix, suffix_len); + + if (contains_wildcard(file)) { + Dir_Expand(file, path, expansions); + free(file); + } else { + Lst_Append(expansions, file); + } + + /* skip over the comma or closing brace */ + piece = piece_end + 1; + } } /* Expand the word in each of the directories from the path. */ static void DirExpandPath(const char *word, SearchPath *path, StringList *expansions) { - SearchPathNode *ln; - for (ln = path->first; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - DirMatchFiles(word, dir, expansions); - } + SearchPathNode *ln; + for (ln = path->first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + DirMatchFiles(word, dir, expansions); + } } static void PrintExpansions(StringList *expansions) { - const char *sep = ""; - StringListNode *ln; - for (ln = expansions->first; ln != NULL; ln = ln->next) { - const char *word = ln->datum; - debug_printf("%s%s", sep, word); - sep = " "; - } - debug_printf("\n"); + const char *sep = ""; + StringListNode *ln; + for (ln = expansions->first; ln != NULL; ln = ln->next) { + const char *word = ln->datum; + debug_printf("%s%s", sep, word); + sep = " "; + } + debug_printf("\n"); } -/* Expand the given word into a list of words by globbing it, looking in the +/* + * Expand the given word into a list of words by globbing it, looking in the * directories on the given search path. * * Input: * word the word to expand * path the directories in which to find the files * expansions the list on which to place the results */ void Dir_Expand(const char *word, SearchPath *path, StringList *expansions) { - const char *cp; + const char *cp; + + assert(path != NULL); + assert(expansions != NULL); - assert(path != NULL); - assert(expansions != NULL); + DEBUG1(DIR, "Expanding \"%s\"... ", word); + + cp = strchr(word, '{'); + if (cp != NULL) { + DirExpandCurly(word, cp, path, expansions); + goto done; + } - DIR_DEBUG1("Expanding \"%s\"... ", word); + /* At this point, the word does not contain '{'. */ - cp = strchr(word, '{'); - if (cp) { - DirExpandCurly(word, cp, path, expansions); - } else { cp = strchr(word, '/'); - if (cp) { - /* - * The thing has a directory component -- find the first wildcard - * in the string. - */ - for (cp = word; *cp; cp++) { - if (*cp == '?' || *cp == '[' || *cp == '*') { - break; - } - } + if (cp == NULL) { + /* The word has no directory component. */ + /* First the files in dot. */ + DirMatchFiles(word, dot, expansions); - if (*cp != '\0') { + /* Then the files in every other directory on the path. */ + DirExpandPath(word, path, expansions); + goto done; + } + + /* At this point, the word has a directory component. */ + + /* Find the first wildcard in the word. */ + for (cp = word; *cp != '\0'; cp++) + if (*cp == '?' || *cp == '[' || *cp == '*') + break; + + if (*cp == '\0') { /* - * Back up to the start of the component + * No directory component and no wildcard at all -- this + * should never happen as in such a simple case there is no + * need to expand anything. */ - while (cp > word && *cp != '/') { - cp--; - } - if (cp != word) { - char *prefix = bmake_strsedup(word, cp + 1); - /* - * If the glob isn't in the first component, try and find - * all the components up to the one with a wildcard. - */ - char *dirpath = Dir_FindFile(prefix, path); - free(prefix); - /* - * dirpath is null if can't find the leading component - * XXX: Dir_FindFile won't find internal components. - * i.e. if the path contains ../Etc/Object and we're - * looking for Etc, it won't be found. Ah well. - * Probably not important. - */ - if (dirpath != NULL) { - char *dp = &dirpath[strlen(dirpath) - 1]; - if (*dp == '/') - *dp = '\0'; - path = Lst_New(); - (void)Dir_AddDir(path, dirpath); - DirExpandPath(cp + 1, path, expansions); - Lst_Free(path); - } - } else { - /* - * Start the search from the local directory - */ - DirExpandPath(word, path, expansions); - } - } else { + DirExpandPath(word, path, expansions); + goto done; + } + + /* Back up to the start of the component containing the wildcard. */ + /* XXX: This handles '///' and '/' differently. */ + while (cp > word && *cp != '/') + cp--; + + if (cp == word) { + /* The first component contains the wildcard. */ + /* Start the search from the local directory */ + DirExpandPath(word, path, expansions); + goto done; + } + + { + char *prefix = bmake_strsedup(word, cp + 1); /* - * Return the file -- this should never happen. + * The wildcard isn't in the first component. + * Find all the components up to the one with the wildcard. */ - DirExpandPath(word, path, expansions); - } - } else { - /* - * First the files in dot - */ - DirMatchFiles(word, dot, expansions); - - /* - * Then the files in every other directory on the path. - */ - DirExpandPath(word, path, expansions); + /* + * XXX: Check the "the directory is added to the path" part. + * It is probably surprising that the directory before a + * wildcard gets added to the path. + */ + /* + * XXX: Only the first match of the prefix in the path is + * taken, any others are ignored. The expectation may be + * that the pattern is expanded in the whole path. + */ + char *dirpath = Dir_FindFile(prefix, path); + free(prefix); + + /* + * dirpath is null if can't find the leading component + * XXX: Dir_FindFile won't find internal components. + * i.e. if the path contains ../Etc/Object and we're + * looking for Etc, it won't be found. Ah well. + * Probably not important. + * XXX: Check whether the above comment is still true. + */ + if (dirpath != NULL) { + SearchPath *partPath; + + char *end = &dirpath[strlen(dirpath) - 1]; + /* XXX: What about multiple trailing slashes? */ + if (*end == '/') + *end = '\0'; + + partPath = SearchPath_New(); + (void)Dir_AddDir(partPath, dirpath); + DirExpandPath(cp + 1, partPath, expansions); + SearchPath_Free(partPath); + } } - } - if (DEBUG(DIR)) - PrintExpansions(expansions); + +done: + if (DEBUG(DIR)) + PrintExpansions(expansions); } -/* Find if the file with the given name exists in the given path. - * Return the freshly allocated path to the file, or NULL. */ +/* + * Find if the file with the given name exists in the given path. + * Return the freshly allocated path to the file, or NULL. + */ static char * DirLookup(CachedDir *dir, const char *base) { - char *file; /* the current filename to check */ + char *file; /* the current filename to check */ - DIR_DEBUG1(" %s ...\n", dir->name); + DEBUG1(DIR, " %s ...\n", dir->name); - if (HashTable_FindEntry(&dir->files, base) == NULL) - return NULL; + if (!HashSet_Contains(&dir->files, base)) + return NULL; - file = str_concat3(dir->name, "/", base); - DIR_DEBUG1(" returning %s\n", file); - dir->hits++; - hits++; - return file; + file = str_concat3(dir->name, "/", base); + DEBUG1(DIR, " returning %s\n", file); + dir->hits++; + hits++; + return file; } -/* Find if the file with the given name exists in the given directory. - * Return the freshly allocated path to the file, or NULL. */ +/* + * Find if the file with the given name exists in the given directory. + * Return the freshly allocated path to the file, or NULL. + */ static char * DirLookupSubdir(CachedDir *dir, const char *name) { - struct cached_stat cst; - char *file = dir == dot ? bmake_strdup(name) - : str_concat3(dir->name, "/", name); + struct cached_stat cst; + char *file = dir == dot ? bmake_strdup(name) + : str_concat3(dir->name, "/", name); - DIR_DEBUG1("checking %s ...\n", file); + DEBUG1(DIR, "checking %s ...\n", file); - if (cached_stat(file, &cst) == 0) { - nearmisses++; - return file; - } - free(file); - return NULL; + if (cached_stat(file, &cst) == 0) { + nearmisses++; + return file; + } + free(file); + return NULL; } -/* Find if the file with the given name exists in the given path. +/* + * Find if the file with the given name exists in the given path. * Return the freshly allocated path to the file, the empty string, or NULL. * Returning the empty string means that the search should be terminated. */ static char * DirLookupAbs(CachedDir *dir, const char *name, const char *cp) { - const char *dnp; /* pointer into dir->name */ - const char *np; /* pointer into name */ - - DIR_DEBUG1(" %s ...\n", dir->name); - - /* - * If the file has a leading path component and that component - * exactly matches the entire name of the current search - * directory, we can attempt another cache lookup. And if we don't - * have a hit, we can safely assume the file does not exist at all. - */ - for (dnp = dir->name, np = name; *dnp != '\0' && *dnp == *np; dnp++, np++) - continue; - if (*dnp != '\0' || np != cp - 1) - return NULL; + const char *dnp; /* pointer into dir->name */ + const char *np; /* pointer into name */ + + DEBUG1(DIR, " %s ...\n", dir->name); - if (HashTable_FindEntry(&dir->files, cp) == NULL) { - DIR_DEBUG0(" must be here but isn't -- returning\n"); - return bmake_strdup(""); /* to terminate the search */ - } + /* + * If the file has a leading path component and that component + * exactly matches the entire name of the current search + * directory, we can attempt another cache lookup. And if we don't + * have a hit, we can safely assume the file does not exist at all. + */ + for (dnp = dir->name, np = name; + *dnp != '\0' && *dnp == *np; dnp++, np++) + continue; + if (*dnp != '\0' || np != cp - 1) + return NULL; + + if (!HashSet_Contains(&dir->files, cp)) { + DEBUG0(DIR, " must be here but isn't -- returning\n"); + return bmake_strdup(""); /* to terminate the search */ + } - dir->hits++; - hits++; - DIR_DEBUG1(" returning %s\n", name); - return bmake_strdup(name); + dir->hits++; + hits++; + DEBUG1(DIR, " returning %s\n", name); + return bmake_strdup(name); } -/* Find the file given on "." or curdir. - * Return the freshly allocated path to the file, or NULL. */ +/* + * Find the file given on "." or curdir. + * Return the freshly allocated path to the file, or NULL. + */ static char * DirFindDot(const char *name, const char *base) { - if (HashTable_FindEntry(&dot->files, base) != NULL) { - DIR_DEBUG0(" in '.'\n"); - hits++; - dot->hits++; - return bmake_strdup(name); - } + if (HashSet_Contains(&dot->files, base)) { + DEBUG0(DIR, " in '.'\n"); + hits++; + dot->hits++; + return bmake_strdup(name); + } - if (cur != NULL && HashTable_FindEntry(&cur->files, base) != NULL) { - DIR_DEBUG1(" in ${.CURDIR} = %s\n", cur->name); - hits++; - cur->hits++; - return str_concat3(cur->name, "/", base); - } + if (cur != NULL && HashSet_Contains(&cur->files, base)) { + DEBUG1(DIR, " in ${.CURDIR} = %s\n", cur->name); + hits++; + cur->hits++; + return str_concat3(cur->name, "/", base); + } - return NULL; + return NULL; } -/* Find the file with the given name along the given search path. +/* + * Find the file with the given name along the given search path. * * If the file is found in a directory that is not on the path * already (either 'name' is absolute or it is a relative path * [ dir1/.../dirn/file ] which exists below one of the directories * already on the search path), its directory is added to the end * of the path, on the assumption that there will be more files in * that directory later on. Sometimes this is true. Sometimes not. * * Input: * name the file to find * path the directories to search, or NULL * * Results: * The freshly allocated path to the file, or NULL. */ char * Dir_FindFile(const char *name, SearchPath *path) { - SearchPathNode *ln; - char *file; /* the current filename to check */ - const char *base; /* Terminal name of file */ - Boolean hasLastDot = FALSE; /* true if we should search dot last */ - Boolean hasSlash; /* true if 'name' contains a / */ - struct cached_stat cst; /* Buffer for stat, if necessary */ - const char *trailing_dot = "."; - - /* - * Find the final component of the name and note whether it has a - * slash in it (the name, I mean) - */ - base = strrchr(name, '/'); - if (base) { - hasSlash = TRUE; - base++; - } else { - hasSlash = FALSE; - base = name; - } - - DIR_DEBUG1("Searching for %s ...", name); - - if (path == NULL) { - DIR_DEBUG0("couldn't open path, file not found\n"); - misses++; - return NULL; - } + char *file; /* the current filename to check */ + Boolean seenDotLast = FALSE; /* true if we should search dot last */ + struct cached_stat cst; /* Buffer for stat, if necessary */ + const char *trailing_dot = "."; + const char *base = str_basename(name); + + DEBUG1(DIR, "Searching for %s ...", name); - if ((ln = path->first) != NULL) { - CachedDir *dir = ln->datum; - if (dir == dotLast) { - hasLastDot = TRUE; - DIR_DEBUG0("[dot last]..."); + if (path == NULL) { + DEBUG0(DIR, "couldn't open path, file not found\n"); + misses++; + return NULL; + } + + if (path->first != NULL) { + CachedDir *dir = path->first->datum; + if (dir == dotLast) { + seenDotLast = TRUE; + DEBUG0(DIR, "[dot last]..."); + } } - } - DIR_DEBUG0("\n"); - - /* - * If there's no leading directory components or if the leading - * directory component is exactly `./', consult the cached contents - * of each of the directories on the search path. - */ - if (!hasSlash || (base - name == 2 && *name == '.')) { + DEBUG0(DIR, "\n"); + /* - * We look through all the directories on the path seeking one which - * contains the final component of the given name. If such a beast - * is found, we concatenate the directory name and the final - * component and return the resulting string. If we don't find any - * such thing, we go on to phase two... - * - * No matter what, we always look for the file in the current - * directory before anywhere else (unless we found the magic - * DOTLAST path, in which case we search it last) and we *do not* - * add the ./ to it if it exists. - * This is so there are no conflicts between what the user - * specifies (fish.c) and what pmake finds (./fish.c). + * If there's no leading directory components or if the leading + * directory component is exactly `./', consult the cached contents + * of each of the directories on the search path. */ - if (!hasLastDot && (file = DirFindDot(name, base)) != NULL) - return file; + if (base == name || (base - name == 2 && *name == '.')) { + SearchPathNode *ln; - for (; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - if (dir == dotLast) - continue; - if ((file = DirLookup(dir, base)) != NULL) - return file; + /* + * We look through all the directories on the path seeking one + * which contains the final component of the given name. If + * such a beast is found, we concatenate the directory name + * and the final component and return the resulting string. + * If we don't find any such thing, we go on to phase two. + * + * No matter what, we always look for the file in the current + * directory before anywhere else (unless we found the magic + * DOTLAST path, in which case we search it last) and we *do + * not* add the ./ to it if it exists. + * This is so there are no conflicts between what the user + * specifies (fish.c) and what pmake finds (./fish.c). + */ + if (!seenDotLast && (file = DirFindDot(name, base)) != NULL) + return file; + + for (ln = path->first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + if (dir == dotLast) + continue; + if ((file = DirLookup(dir, base)) != NULL) + return file; + } + + if (seenDotLast && (file = DirFindDot(name, base)) != NULL) + return file; } - if (hasLastDot && (file = DirFindDot(name, base)) != NULL) - return file; - } - - /* - * We didn't find the file on any directory in the search path. - * If the name doesn't contain a slash, that means it doesn't exist. - * If it *does* contain a slash, however, there is still hope: it - * could be in a subdirectory of one of the members of the search - * path. (eg. /usr/include and sys/types.h. The above search would - * fail to turn up types.h in /usr/include, but it *is* in - * /usr/include/sys/types.h). - * [ This no longer applies: If we find such a beast, we assume there - * will be more (what else can we assume?) and add all but the last - * component of the resulting name onto the search path (at the - * end).] - * This phase is only performed if the file is *not* absolute. - */ - if (!hasSlash) { - DIR_DEBUG0(" failed.\n"); - misses++; - return NULL; - } + /* + * We didn't find the file on any directory in the search path. + * If the name doesn't contain a slash, that means it doesn't exist. + * If it *does* contain a slash, however, there is still hope: it + * could be in a subdirectory of one of the members of the search + * path. (eg. /usr/include and sys/types.h. The above search would + * fail to turn up types.h in /usr/include, but it *is* in + * /usr/include/sys/types.h). + * [ This no longer applies: If we find such a beast, we assume there + * will be more (what else can we assume?) and add all but the last + * component of the resulting name onto the search path (at the + * end).] + * This phase is only performed if the file is *not* absolute. + */ + if (base == name) { + DEBUG0(DIR, " failed.\n"); + misses++; + return NULL; + } - if (*base == '\0') { - /* we were given a trailing "/" */ - base = trailing_dot; - } + if (*base == '\0') { + /* we were given a trailing "/" */ + base = trailing_dot; + } - if (name[0] != '/') { - Boolean checkedDot = FALSE; + if (name[0] != '/') { + SearchPathNode *ln; + Boolean checkedDot = FALSE; + + DEBUG0(DIR, " Trying subdirectories...\n"); + + if (!seenDotLast) { + if (dot != NULL) { + checkedDot = TRUE; + if ((file = DirLookupSubdir(dot, name)) != NULL) + return file; + } + if (cur != NULL && + (file = DirLookupSubdir(cur, name)) != NULL) + return file; + } - DIR_DEBUG0(" Trying subdirectories...\n"); + for (ln = path->first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + if (dir == dotLast) + continue; + if (dir == dot) { + if (checkedDot) + continue; + checkedDot = TRUE; + } + if ((file = DirLookupSubdir(dir, name)) != NULL) + return file; + } - if (!hasLastDot) { - if (dot) { - checkedDot = TRUE; - if ((file = DirLookupSubdir(dot, name)) != NULL) - return file; - } - if (cur && (file = DirLookupSubdir(cur, name)) != NULL) - return file; - } + if (seenDotLast) { + if (dot != NULL && !checkedDot) { + checkedDot = TRUE; + if ((file = DirLookupSubdir(dot, name)) != NULL) + return file; + } + if (cur != NULL && + (file = DirLookupSubdir(cur, name)) != NULL) + return file; + } - for (ln = path->first; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - if (dir == dotLast) - continue; - if (dir == dot) { - if (checkedDot) - continue; - checkedDot = TRUE; - } - if ((file = DirLookupSubdir(dir, name)) != NULL) - return file; - } + if (checkedDot) { + /* + * Already checked by the given name, since . was in + * the path, so no point in proceeding. + */ + DEBUG0(DIR, " Checked . already, returning NULL\n"); + return NULL; + } - if (hasLastDot) { - if (dot && !checkedDot) { - checkedDot = TRUE; - if ((file = DirLookupSubdir(dot, name)) != NULL) - return file; - } - if (cur && (file = DirLookupSubdir(cur, name)) != NULL) - return file; - } + } else { /* name[0] == '/' */ + SearchPathNode *ln; - if (checkedDot) { - /* - * Already checked by the given name, since . was in the path, - * so no point in proceeding... - */ - DIR_DEBUG0(" Checked . already, returning NULL\n"); - return NULL; - } + /* + * For absolute names, compare directory path prefix against + * the the directory path of each member on the search path + * for an exact match. If we have an exact match on any member + * of the search path, use the cached contents of that member + * to lookup the final file component. If that lookup fails we + * can safely assume that the file does not exist at all. + * This is signified by DirLookupAbs() returning an empty + * string. + */ + DEBUG0(DIR, " Trying exact path matches...\n"); + + if (!seenDotLast && cur != NULL && + ((file = DirLookupAbs(cur, name, base)) != NULL)) { + if (file[0] == '\0') { + free(file); + return NULL; + } + return file; + } - } else { /* name[0] == '/' */ + for (ln = path->first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + if (dir == dotLast) + continue; + if ((file = DirLookupAbs(dir, name, base)) != NULL) { + if (file[0] == '\0') { + free(file); + return NULL; + } + return file; + } + } + + if (seenDotLast && cur != NULL && + ((file = DirLookupAbs(cur, name, base)) != NULL)) { + if (file[0] == '\0') { + free(file); + return NULL; + } + return file; + } + } /* - * For absolute names, compare directory path prefix against the - * the directory path of each member on the search path for an exact - * match. If we have an exact match on any member of the search path, - * use the cached contents of that member to lookup the final file - * component. If that lookup fails we can safely assume that the - * file does not exist at all. This is signified by DirLookupAbs() - * returning an empty string. + * Didn't find it that way, either. Sigh. Phase 3. Add its directory + * onto the search path in any case, just in case, then look for the + * thing in the hash table. If we find it, grand. We return a new + * copy of the name. Otherwise we sadly return a NULL pointer. Sigh. + * Note that if the directory holding the file doesn't exist, this + * will do an extra search of the final directory on the path. Unless + * something weird happens, this search won't succeed and life will + * be groovy. + * + * Sigh. We cannot add the directory onto the search path because + * of this amusing case: + * $(INSTALLDIR)/$(FILE): $(FILE) + * + * $(FILE) exists in $(INSTALLDIR) but not in the current one. + * When searching for $(FILE), we will find it in $(INSTALLDIR) + * b/c we added it here. This is not good... */ - DIR_DEBUG0(" Trying exact path matches...\n"); - - if (!hasLastDot && cur && - ((file = DirLookupAbs(cur, name, base)) != NULL)) { - if (file[0] == '\0') { - free(file); - return NULL; - } - return file; - } +#if 0 + { + CachedDir *dir; + char *prefix; - for (ln = path->first; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - if (dir == dotLast) - continue; - if ((file = DirLookupAbs(dir, name, base)) != NULL) { - if (file[0] == '\0') { - free(file); - return NULL; + if (base == trailing_dot) { + base = strrchr(name, '/'); + base++; } - return file; - } - } + prefix = bmake_strsedup(name, base - 1); + (void)Dir_AddDir(path, prefix); + free(prefix); + + bigmisses++; + if (path->last == NULL) + return NULL; - if (hasLastDot && cur && - ((file = DirLookupAbs(cur, name, base)) != NULL)) { - if (file[0] == '\0') { - free(file); + dir = path->last->datum; + if (HashSet_Contains(&dir->files, base)) + return bmake_strdup(name); return NULL; - } - return file; } - } - - /* - * Didn't find it that way, either. Sigh. Phase 3. Add its directory - * onto the search path in any case, just in case, then look for the - * thing in the hash table. If we find it, grand. We return a new - * copy of the name. Otherwise we sadly return a NULL pointer. Sigh. - * Note that if the directory holding the file doesn't exist, this will - * do an extra search of the final directory on the path. Unless something - * weird happens, this search won't succeed and life will be groovy. - * - * Sigh. We cannot add the directory onto the search path because - * of this amusing case: - * $(INSTALLDIR)/$(FILE): $(FILE) - * - * $(FILE) exists in $(INSTALLDIR) but not in the current one. - * When searching for $(FILE), we will find it in $(INSTALLDIR) - * b/c we added it here. This is not good... - */ -#if 0 - if (base == trailing_dot) { - base = strrchr(name, '/'); - base++; - } - base[-1] = '\0'; - (void)Dir_AddDir(path, name); - base[-1] = '/'; - - bigmisses++; - ln = Lst_Last(path); - if (ln == NULL) { - return NULL; - } else { - dir = LstNode_Datum(ln); - } - - if (Hash_FindEntry(&dir->files, base) != NULL) { - return bmake_strdup(name); - } else { - return NULL; - } #else - DIR_DEBUG1(" Looking for \"%s\" ...\n", name); + DEBUG1(DIR, " Looking for \"%s\" ...\n", name); - bigmisses++; - if (cached_stat(name, &cst) == 0) { - return bmake_strdup(name); - } + bigmisses++; + if (cached_stat(name, &cst) == 0) { + return bmake_strdup(name); + } - DIR_DEBUG0(" failed. Returning NULL\n"); - return NULL; + DEBUG0(DIR, " failed. Returning NULL\n"); + return NULL; #endif } -/* Search for a path starting at a given directory and then working our way +/* + * Search for a path starting at a given directory and then working our way * up towards the root. * * Input: * here starting directory * search_path the relative path we are looking for * * Results: * The found path, or NULL. */ char * Dir_FindHereOrAbove(const char *here, const char *search_path) { - struct cached_stat cst; - char *dirbase, *dirbase_end; - char *try, *try_end; - - /* copy out our starting point */ - dirbase = bmake_strdup(here); - dirbase_end = dirbase + strlen(dirbase); - - /* loop until we determine a result */ - for (;;) { - - /* try and stat(2) it ... */ - try = str_concat3(dirbase, "/", search_path); - if (cached_stat(try, &cst) != -1) { - /* - * success! if we found a file, chop off - * the filename so we return a directory. - */ - if ((cst.cst_mode & S_IFMT) != S_IFDIR) { - try_end = try + strlen(try); - while (try_end > try && *try_end != '/') - try_end--; - if (try_end > try) - *try_end = '\0'; /* chop! */ - } - - free(dirbase); - return try; + struct cached_stat cst; + char *dirbase, *dirbase_end; + char *try, *try_end; + + /* copy out our starting point */ + dirbase = bmake_strdup(here); + dirbase_end = dirbase + strlen(dirbase); + + /* loop until we determine a result */ + for (;;) { + + /* try and stat(2) it ... */ + try = str_concat3(dirbase, "/", search_path); + if (cached_stat(try, &cst) != -1) { + /* + * success! if we found a file, chop off + * the filename so we return a directory. + */ + if ((cst.cst_mode & S_IFMT) != S_IFDIR) { + try_end = try + strlen(try); + while (try_end > try && *try_end != '/') + try_end--; + if (try_end > try) + *try_end = '\0'; /* chop! */ + } + + free(dirbase); + return try; + } + free(try); + + /* + * nope, we didn't find it. if we used up dirbase we've + * reached the root and failed. + */ + if (dirbase_end == dirbase) + break; /* failed! */ + + /* + * truncate dirbase from the end to move up a dir + */ + while (dirbase_end > dirbase && *dirbase_end != '/') + dirbase_end--; + *dirbase_end = '\0'; /* chop! */ } - free(try); + + free(dirbase); + return NULL; +} + +/* + * This is an implied source, and it may have moved, + * see if we can find it via the current .PATH + */ +static char * +ResolveMovedDepends(GNode *gn) +{ + char *fullName; + + const char *base = str_basename(gn->name); + if (base == gn->name) + return NULL; + + fullName = Dir_FindFile(base, Suff_FindPath(gn)); + if (fullName == NULL) + return NULL; /* - * nope, we didn't find it. if we used up dirbase we've - * reached the root and failed. + * Put the found file in gn->path so that we give that to the compiler. */ - if (dirbase_end == dirbase) - break; /* failed! */ - /* - * truncate dirbase from the end to move up a dir + * XXX: Better just reset gn->path to NULL; updating it is already done + * by Dir_UpdateMTime. */ - while (dirbase_end > dirbase && *dirbase_end != '/') - dirbase_end--; - *dirbase_end = '\0'; /* chop! */ - } + gn->path = bmake_strdup(fullName); + if (!Job_RunTarget(".STALE", gn->fname)) + fprintf(stdout, /* XXX: Why stdout? */ + "%s: %s, %d: ignoring stale %s for %s, found %s\n", + progname, gn->fname, gn->lineno, + makeDependfile, gn->name, fullName); + + return fullName; +} + +static char * +ResolveFullName(GNode *gn) +{ + char *fullName; + + fullName = gn->path; + if (fullName == NULL && !(gn->type & OP_NOPATH)) { + + fullName = Dir_FindFile(gn->name, Suff_FindPath(gn)); + + if (fullName == NULL && gn->flags & FROM_DEPEND && + !Lst_IsEmpty(&gn->implicitParents)) + fullName = ResolveMovedDepends(gn); + + DEBUG2(DIR, "Found '%s' as '%s'\n", + gn->name, fullName != NULL ? fullName : "(not found)"); + } + + if (fullName == NULL) + fullName = bmake_strdup(gn->name); + + /* XXX: Is every piece of memory freed as it should? */ - free(dirbase); - return NULL; + return fullName; } -/* Search gn along dirSearchPath and store its modification time in gn->mtime. +/* + * Search gn along dirSearchPath and store its modification time in gn->mtime. * If no file is found, store 0 instead. * - * The found file is stored in gn->path, unless the node already had a path. */ + * The found file is stored in gn->path, unless the node already had a path. + */ void Dir_UpdateMTime(GNode *gn, Boolean recheck) { - char *fullName; - struct cached_stat cst; - - if (gn->type & OP_ARCHV) { - Arch_UpdateMTime(gn); - return; - } - - if (gn->type & OP_PHONY) { - gn->mtime = 0; - return; - } - - if (gn->path == NULL) { - if (gn->type & OP_NOPATH) - fullName = NULL; - else { - fullName = Dir_FindFile(gn->name, Suff_FindPath(gn)); - if (fullName == NULL && gn->flags & FROM_DEPEND && - !Lst_IsEmpty(gn->implicitParents)) { - char *cp; - - cp = strrchr(gn->name, '/'); - if (cp) { - /* - * This is an implied source, and it may have moved, - * see if we can find it via the current .PATH - */ - cp++; - - fullName = Dir_FindFile(cp, Suff_FindPath(gn)); - if (fullName) { - /* - * Put the found file in gn->path - * so that we give that to the compiler. - */ - gn->path = bmake_strdup(fullName); - if (!Job_RunTarget(".STALE", gn->fname)) - fprintf(stdout, - "%s: %s, %d: ignoring stale %s for %s, " - "found %s\n", progname, gn->fname, - gn->lineno, - makeDependfile, gn->name, fullName); - } + char *fullName; + struct cached_stat cst; + + if (gn->type & OP_ARCHV) { + Arch_UpdateMTime(gn); + return; + } + + if (gn->type & OP_PHONY) { + gn->mtime = 0; + return; + } + + fullName = ResolveFullName(gn); + + if (cached_stats(fullName, &cst, recheck ? CST_UPDATE : CST_NONE) < 0) { + if (gn->type & OP_MEMBER) { + if (fullName != gn->path) + free(fullName); + Arch_UpdateMemberMTime(gn); + return; } - } - DIR_DEBUG2("Found '%s' as '%s'\n", - gn->name, fullName ? fullName : "(not found)"); + + cst.cst_mtime = 0; } - } else { - fullName = gn->path; - } - if (fullName == NULL) - fullName = bmake_strdup(gn->name); + if (fullName != NULL && gn->path == NULL) + gn->path = fullName; + /* XXX: else free(fullName)? */ + + gn->mtime = cst.cst_mtime; +} + +/* + * Read the directory and add it to the cache in openDirs. + * If a path is given, add the directory to that path as well. + */ +static CachedDir * +CacheNewDir(const char *name, SearchPath *path) +{ + CachedDir *dir = NULL; + DIR *d; + struct dirent *dp; - if (cached_stats(fullName, &cst, recheck ? CST_UPDATE : CST_NONE) < 0) { - if (gn->type & OP_MEMBER) { - if (fullName != gn->path) - free(fullName); - Arch_UpdateMemberMTime(gn); - return; + if ((d = opendir(name)) == NULL) { + DEBUG1(DIR, "Caching %s ... not found\n", name); + return dir; } - cst.cst_mtime = 0; - } + DEBUG1(DIR, "Caching %s ...\n", name); - if (fullName != NULL && gn->path == NULL) - gn->path = fullName; + dir = CachedDir_New(name); + + while ((dp = readdir(d)) != NULL) { + +#if defined(sun) && defined(d_ino) /* d_ino is a sunos4 #define for d_fileno */ + /* + * The sun directory library doesn't check for a 0 inode + * (0-inode slots just take up space), so we have to do + * it ourselves. + */ + if (dp->d_fileno == 0) + continue; +#endif /* sun && d_ino */ + + (void)HashSet_Add(&dir->files, dp->d_name); + } + (void)closedir(d); + + OpenDirs_Add(&openDirs, dir); + if (path != NULL) + Lst_Append(path, CachedDir_Ref(dir)); - gn->mtime = cst.cst_mtime; + DEBUG1(DIR, "Caching %s done\n", name); + return dir; } -/* Read the list of filenames in the directory and store the result - * in openDirectories. +/* + * Read the list of filenames in the directory and store the result + * in openDirs. * * If a path is given, append the directory to that path. * * Input: * path The path to which the directory should be - * added, or NULL to only add the directory to - * openDirectories + * added, or NULL to only add the directory to openDirs * name The name of the directory to add. * The name is not normalized in any way. + * Output: + * result If no path is given and the directory exists, the + * returned CachedDir has a reference count of 0. It + * must either be assigned to a variable using + * CachedDir_Assign or be appended to a SearchPath using + * Lst_Append and CachedDir_Ref. */ CachedDir * Dir_AddDir(SearchPath *path, const char *name) { - CachedDir *dir = NULL; /* the added directory */ - DIR *d; - struct dirent *dp; - if (path != NULL && strcmp(name, ".DOTLAST") == 0) { - SearchPathNode *ln; + if (path != NULL && strcmp(name, ".DOTLAST") == 0) { + SearchPathNode *ln; - /* XXX: Linear search gets slow with thousands of entries. */ - for (ln = path->first; ln != NULL; ln = ln->next) { - CachedDir *pathDir = ln->datum; - if (strcmp(pathDir->name, name) == 0) - return pathDir; - } - - dotLast->refCount++; - Lst_Prepend(path, dotLast); - } + /* XXX: Linear search gets slow with thousands of entries. */ + for (ln = path->first; ln != NULL; ln = ln->next) { + CachedDir *pathDir = ln->datum; + if (strcmp(pathDir->name, name) == 0) + return pathDir; + } - if (path != NULL) - dir = OpenDirs_Find(&openDirs, name); - if (dir != NULL) { - if (Lst_FindDatum(path, dir) == NULL) { - dir->refCount++; - Lst_Append(path, dir); + Lst_Prepend(path, CachedDir_Ref(dotLast)); } - return dir; - } - - DIR_DEBUG1("Caching %s ...", name); - - if ((d = opendir(name)) != NULL) { - dir = bmake_malloc(sizeof *dir); - dir->name = bmake_strdup(name); - dir->hits = 0; - dir->refCount = 1; - HashTable_Init(&dir->files); - while ((dp = readdir(d)) != NULL) { -#if defined(sun) && defined(d_ino) /* d_ino is a sunos4 #define for d_fileno */ - /* - * The sun directory library doesn't check for a 0 inode - * (0-inode slots just take up space), so we have to do - * it ourselves. - */ - if (dp->d_fileno == 0) { - continue; - } -#endif /* sun && d_ino */ - (void)HashTable_CreateEntry(&dir->files, dp->d_name, NULL); + if (path != NULL) { + /* XXX: Why is OpenDirs only checked if path != NULL? */ + CachedDir *dir = OpenDirs_Find(&openDirs, name); + if (dir != NULL) { + if (Lst_FindDatum(path, dir) == NULL) + Lst_Append(path, CachedDir_Ref(dir)); + return dir; + } } - (void)closedir(d); - OpenDirs_Add(&openDirs, dir); - if (path != NULL) - Lst_Append(path, dir); - } - DIR_DEBUG0("done\n"); - return dir; + + return CacheNewDir(name, path); } -/* Return a copy of dirSearchPath, incrementing the reference counts for - * the contained directories. */ +/* + * Return a copy of dirSearchPath, incrementing the reference counts for + * the contained directories. + */ SearchPath * Dir_CopyDirSearchPath(void) { - SearchPath *path = Lst_New(); - SearchPathNode *ln; - for (ln = dirSearchPath->first; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - dir->refCount++; - Lst_Append(path, dir); - } - return path; + SearchPath *path = SearchPath_New(); + SearchPathNode *ln; + for (ln = dirSearchPath.first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + Lst_Append(path, CachedDir_Ref(dir)); + } + return path; } -/*- - *----------------------------------------------------------------------- - * Dir_MakeFlags -- - * Make a string by taking all the directories in the given search - * path and preceding them by the given flag. Used by the suffix - * module to create variables for compilers based on suffix search - * paths. +/* + * Make a string by taking all the directories in the given search path and + * preceding them by the given flag. Used by the suffix module to create + * variables for compilers based on suffix search paths. * * Input: * flag flag which should precede each directory * path list of directories * * Results: - * The string mentioned above. Note that there is no space between - * the given flag and each directory. The empty string is returned if - * Things don't go well. - * - * Side Effects: - * None - *----------------------------------------------------------------------- + * The string mentioned above. Note that there is no space between the + * given flag and each directory. The empty string is returned if things + * don't go well. */ char * -Dir_MakeFlags(const char *flag, SearchPath *path) +SearchPath_ToFlags(const char *flag, SearchPath *path) { - Buffer buf; - SearchPathNode *ln; + Buffer buf; + SearchPathNode *ln; - Buf_Init(&buf); + Buf_Init(&buf); - if (path != NULL) { - for (ln = path->first; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - Buf_AddStr(&buf, " "); - Buf_AddStr(&buf, flag); - Buf_AddStr(&buf, dir->name); + if (path != NULL) { + for (ln = path->first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + Buf_AddStr(&buf, " "); + Buf_AddStr(&buf, flag); + Buf_AddStr(&buf, dir->name); + } } - } - return Buf_Destroy(&buf, FALSE); + return Buf_Destroy(&buf, FALSE); } -/* Nuke a directory descriptor, if possible. Callback procedure for the - * suffixes module when destroying a search path. - * - * Input: - * dirp The directory descriptor to nuke - */ +/* Free the search path and all directories mentioned in it. */ void -Dir_Destroy(void *dirp) +SearchPath_Free(SearchPath *path) { - CachedDir *dir = dirp; - dir->refCount--; - - if (dir->refCount == 0) { - OpenDirs_Remove(&openDirs, dir->name); + SearchPathNode *ln; - HashTable_Done(&dir->files); - free(dir->name); - free(dir); - } + for (ln = path->first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + CachedDir_Unref(dir); + } + Lst_Free(path); } -/* Clear out all elements from the given search path. - * The path is set to the empty list but is not destroyed. */ +/* + * Clear out all elements from the given search path. + * The path is set to the empty list but is not destroyed. + */ void -Dir_ClearPath(SearchPath *path) +SearchPath_Clear(SearchPath *path) { - while (!Lst_IsEmpty(path)) { - CachedDir *dir = Lst_Dequeue(path); - Dir_Destroy(dir); - } + while (!Lst_IsEmpty(path)) { + CachedDir *dir = Lst_Dequeue(path); + CachedDir_Unref(dir); + } } -/* Concatenate two paths, adding the second to the end of the first, - * skipping duplicates. */ +/* + * Concatenate two paths, adding the second to the end of the first, + * skipping duplicates. + */ void -Dir_Concat(SearchPath *dst, SearchPath *src) +SearchPath_AddAll(SearchPath *dst, SearchPath *src) { - SearchPathNode *ln; + SearchPathNode *ln; - for (ln = src->first; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - if (Lst_FindDatum(dst, dir) == NULL) { - dir->refCount++; - Lst_Append(dst, dir); + for (ln = src->first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + if (Lst_FindDatum(dst, dir) == NULL) + Lst_Append(dst, CachedDir_Ref(dir)); } - } } static int percentage(int num, int den) { - return den != 0 ? num * 100 / den : 0; + return den != 0 ? num * 100 / den : 0; } /********** DEBUG INFO **********/ void Dir_PrintDirectories(void) { - CachedDirListNode *ln; - - debug_printf("#*** Directory Cache:\n"); - debug_printf("# Stats: %d hits %d misses %d near misses %d losers (%d%%)\n", - hits, misses, nearmisses, bigmisses, - percentage(hits, hits + bigmisses + nearmisses)); - debug_printf("# %-20s referenced\thits\n", "directory"); - - for (ln = openDirs.list->first; ln != NULL; ln = ln->next) { - CachedDir *dir = ln->datum; - debug_printf("# %-20s %10d\t%4d\n", dir->name, dir->refCount, - dir->hits); - } + CachedDirListNode *ln; + + debug_printf("#*** Directory Cache:\n"); + debug_printf( + "# Stats: %d hits %d misses %d near misses %d losers (%d%%)\n", + hits, misses, nearmisses, bigmisses, + percentage(hits, hits + bigmisses + nearmisses)); + debug_printf("# refs hits directory\n"); + + for (ln = openDirs.list.first; ln != NULL; ln = ln->next) { + CachedDir *dir = ln->datum; + debug_printf("# %4d %4d %s\n", + dir->refCount, dir->hits, dir->name); + } } void -Dir_PrintPath(SearchPath *path) +SearchPath_Print(SearchPath *path) { - SearchPathNode *node; - for (node = path->first; node != NULL; node = node->next) { - const CachedDir *dir = node->datum; - debug_printf("%s ", dir->name); - } + SearchPathNode *ln; + + for (ln = path->first; ln != NULL; ln = ln->next) { + const CachedDir *dir = ln->datum; + debug_printf("%s ", dir->name); + } } diff --git a/dir.h b/dir.h index d0badcd1dec7..9d9002b166be 100644 --- a/dir.h +++ b/dir.h @@ -1,123 +1,107 @@ -/* $NetBSD: dir.h,v 1.34 2020/11/14 19:24:24 rillig Exp $ */ +/* $NetBSD: dir.h,v 1.40 2020/12/01 19:28:32 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)dir.h 8.1 (Berkeley) 6/6/93 */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)dir.h 8.1 (Berkeley) 6/6/93 */ -#ifndef MAKE_DIR_H -#define MAKE_DIR_H +#ifndef MAKE_DIR_H +#define MAKE_DIR_H -/* A cache for the filenames in a directory. */ -typedef struct CachedDir { - char *name; /* Name of directory, either absolute or - * relative to the current directory. - * The name is not normalized in any way, - * that is, "." and "./." are different. - * - * Not sure what happens when .CURDIR is - * assigned a new value; see Parse_DoVar. */ - int refCount; /* Number of SearchPaths with this directory */ - int hits; /* The number of times a file in this - * directory has been found */ - HashTable files; /* Hash set of files in directory; - * all values are NULL. */ -} CachedDir; +typedef struct CachedDir CachedDir; void Dir_Init(void); -void Dir_InitDir(const char *); void Dir_InitCur(const char *); void Dir_InitDot(void); void Dir_End(void); void Dir_SetPATH(void); Boolean Dir_HasWildcards(const char *); void Dir_Expand(const char *, SearchPath *, StringList *); char *Dir_FindFile(const char *, SearchPath *); char *Dir_FindHereOrAbove(const char *, const char *); void Dir_UpdateMTime(GNode *, Boolean); CachedDir *Dir_AddDir(SearchPath *, const char *); -char *Dir_MakeFlags(const char *, SearchPath *); -void Dir_ClearPath(SearchPath *); -void Dir_Concat(SearchPath *, SearchPath *); +char *SearchPath_ToFlags(const char *, SearchPath *); +void SearchPath_Clear(SearchPath *); +void SearchPath_AddAll(SearchPath *, SearchPath *); void Dir_PrintDirectories(void); -void Dir_PrintPath(SearchPath *); -void Dir_Destroy(void *); +void SearchPath_Print(SearchPath *); SearchPath *Dir_CopyDirSearchPath(void); /* Stripped-down variant of struct stat. */ struct cached_stat { - time_t cst_mtime; - mode_t cst_mode; + time_t cst_mtime; + mode_t cst_mode; }; int cached_lstat(const char *, struct cached_stat *); int cached_stat(const char *, struct cached_stat *); #endif /* MAKE_DIR_H */ diff --git a/enum.c b/enum.c index cce986905411..f08b4edd978d 100755 --- a/enum.c +++ b/enum.c @@ -1,89 +1,92 @@ -/* $NetBSD: enum.c,v 1.12 2020/10/05 19:27:47 rillig Exp $ */ +/* $NetBSD: enum.c,v 1.14 2021/01/09 16:06:09 rillig Exp $ */ /* Copyright (c) 2020 Roland Illig All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "make.h" -MAKE_RCSID("$NetBSD: enum.c,v 1.12 2020/10/05 19:27:47 rillig Exp $"); +MAKE_RCSID("$NetBSD: enum.c,v 1.14 2021/01/09 16:06:09 rillig Exp $"); -/* Convert a bitset into a string representation, showing the names of the +/* + * Convert a bitset into a string representation, showing the names of the * individual bits. * * Optionally, shortcuts for groups of bits can be added. To have an effect, - * they need to be listed before their individual bits. */ + * they need to be listed before their individual bits. + */ const char * Enum_FlagsToString(char *buf, size_t buf_size, int value, const EnumToStringSpec *spec) { const char *buf_start = buf; const char *sep = ""; size_t sep_len = 0; for (; spec->es_value != 0; spec++) { size_t name_len; if ((value & spec->es_value) != spec->es_value) continue; value &= ~spec->es_value; assert(buf_size >= sep_len + 1); memcpy(buf, sep, sep_len); buf += sep_len; buf_size -= sep_len; name_len = strlen(spec->es_name); assert(buf_size >= name_len + 1); memcpy(buf, spec->es_name, name_len); buf += name_len; buf_size -= name_len; sep = ENUM__SEP; sep_len = sizeof ENUM__SEP - 1; } /* If this assertion fails, the listed enum values are incomplete. */ assert(value == 0); if (buf == buf_start) return "none"; assert(buf_size >= 1); buf[0] = '\0'; return buf_start; } /* Convert a fixed-value enum into a string representation. */ const char * Enum_ValueToString(int value, const EnumToStringSpec *spec) { for (; spec->es_name[0] != '\0'; spec++) { if (value == spec->es_value) return spec->es_name; } abort(/* unknown enum value */); + /*NOTREACHED*/ } diff --git a/enum.h b/enum.h index ba7c7a826e97..6707214e8b0d 100755 --- a/enum.h +++ b/enum.h @@ -1,215 +1,246 @@ -/* $NetBSD: enum.h,v 1.12 2020/09/25 15:54:50 rillig Exp $ */ +/* $NetBSD: enum.h,v 1.14 2020/12/30 10:03:16 rillig Exp $ */ /* Copyright (c) 2020 Roland Illig All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef MAKE_ENUM_H #define MAKE_ENUM_H /* Generate string representations for bitmasks and simple enums. */ #include typedef struct EnumToStringSpec { int es_value; const char *es_name; } EnumToStringSpec; const char *Enum_FlagsToString(char *, size_t, int, const EnumToStringSpec *); const char *Enum_ValueToString(int, const EnumToStringSpec *); /* For Enum_FlagsToString, the separator between flags. */ #define ENUM__SEP "|" -/* Generate the string that joins all possible flags, to see how large the - * buffer must be. */ +/* + * Generate the string that joins all possible flags, to see how large the + * buffer must be. + */ #define ENUM__JOIN_STR_1(v1) \ #v1 #define ENUM__JOIN_STR_2(v1, v2) \ ENUM__JOIN_STR_1(v1) ENUM__SEP \ ENUM__JOIN_STR_1(v2) #define ENUM__JOIN_STR_4(v1, v2, v3, v4) \ ENUM__JOIN_STR_2(v1, v2) ENUM__SEP \ ENUM__JOIN_STR_2(v3, v4) #define ENUM__JOIN_STR_8(v1, v2, v3, v4, v5, v6, v7, v8) \ ENUM__JOIN_STR_4(v1, v2, v3, v4) ENUM__SEP \ ENUM__JOIN_STR_4(v5, v6, v7, v8) #define ENUM__JOIN_STR_16(v01, v02, v03, v04, v05, v06, v07, v08, \ v09, v10, v11, v12, v13, v14, v15, v16) \ ENUM__JOIN_STR_8(v01, v02, v03, v04, v05, v06, v07, v08) ENUM__SEP \ ENUM__JOIN_STR_8(v09, v10, v11, v12, v13, v14, v15, v16) #define ENUM__JOIN_2(part1, part2) \ part1 ENUM__SEP part2 #define ENUM__JOIN_3(part1, part2, part3) \ part1 ENUM__SEP part2 ENUM__SEP part3 #define ENUM__JOIN_4(part1, part2, part3, part4) \ part1 ENUM__SEP part2 ENUM__SEP part3 ENUM__SEP part4 #define ENUM__JOIN_5(part1, part2, part3, part4, part5) \ part1 ENUM__SEP part2 ENUM__SEP part3 ENUM__SEP part4 ENUM__SEP part5 /* List the pairs of enum value and corresponding name. */ #define ENUM__SPEC_1(v1) \ { v1, #v1 } #define ENUM__SPEC_2(v1, v2) \ ENUM__SPEC_1(v1), \ ENUM__SPEC_1(v2) #define ENUM__SPEC_4(v1, v2, v3, v4) \ ENUM__SPEC_2(v1, v2), \ ENUM__SPEC_2(v3, v4) #define ENUM__SPEC_8(v1, v2, v3, v4, v5, v6, v7, v8) \ ENUM__SPEC_4(v1, v2, v3, v4), \ ENUM__SPEC_4(v5, v6, v7, v8) #define ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \ v09, v10, v11, v12, v13, v14, v15, v16) \ ENUM__SPEC_8(v01, v02, v03, v04, v05, v06, v07, v08), \ ENUM__SPEC_8(v09, v10, v11, v12, v13, v14, v15, v16) #define ENUM__SPECS_2(part1, part2) \ { part1, part2, { 0, "" } } #define ENUM__SPECS_3(part1, part2, part3) \ { part1, part2, part3, { 0, "" } } #define ENUM__SPECS_4(part1, part2, part3, part4) \ { part1, part2, part3, part4, { 0, "" } } #define ENUM__SPECS_5(part1, part2, part3, part4, part5) \ { part1, part2, part3, part4, part5, { 0, "" } } /* Declare the necessary data structures for calling Enum_ValueToString. */ #define ENUM__VALUE_RTTI(typnam, specs) \ static const EnumToStringSpec typnam ## _ ## ToStringSpecs[] = specs /* Declare the necessary data structures for calling Enum_FlagsToString. */ #define ENUM__FLAGS_RTTI(typnam, specs, joined) \ static const EnumToStringSpec typnam ## _ ## ToStringSpecs[] = specs; \ enum { typnam ## _ ## ToStringSize = sizeof joined } -/* Declare the necessary data structures for calling Enum_FlagsToString - * for an enum with 2 flags. */ +/* + * Declare the necessary data structures for calling Enum_FlagsToString + * for an enum with 2 flags. + */ #define ENUM_FLAGS_RTTI_2(typnam, v1, v2) \ ENUM__FLAGS_RTTI(typnam, \ ENUM__SPECS_2( \ ENUM__SPEC_1(v1), \ ENUM__SPEC_1(v2)), \ ENUM__JOIN_2( \ ENUM__JOIN_STR_1(v1), \ ENUM__JOIN_STR_1(v2))) -/* Declare the necessary data structures for calling Enum_FlagsToString - * for an enum with 3 flags. */ +/* + * Declare the necessary data structures for calling Enum_FlagsToString + * for an enum with 3 flags. + */ #define ENUM_FLAGS_RTTI_3(typnam, v1, v2, v3) \ ENUM__FLAGS_RTTI(typnam, \ ENUM__SPECS_2( \ ENUM__SPEC_2(v1, v2), \ ENUM__SPEC_1(v3)), \ ENUM__JOIN_2( \ ENUM__JOIN_STR_2(v1, v2), \ ENUM__JOIN_STR_1(v3))) -/* Declare the necessary data structures for calling Enum_FlagsToString - * for an enum with 6 flags. */ +/* + * Declare the necessary data structures for calling Enum_FlagsToString + * for an enum with 4 flags. + */ +#define ENUM_FLAGS_RTTI_4(typnam, v1, v2, v3, v4) \ + ENUM__FLAGS_RTTI(typnam, \ + ENUM__SPECS_2( \ + ENUM__SPEC_2(v1, v2), \ + ENUM__SPEC_2(v3, v4)), \ + ENUM__JOIN_2( \ + ENUM__JOIN_STR_2(v1, v2), \ + ENUM__JOIN_STR_2(v3, v4))) + +/* + * Declare the necessary data structures for calling Enum_FlagsToString + * for an enum with 6 flags. + */ #define ENUM_FLAGS_RTTI_6(typnam, v1, v2, v3, v4, v5, v6) \ ENUM__FLAGS_RTTI(typnam, \ ENUM__SPECS_2( \ ENUM__SPEC_4(v1, v2, v3, v4), \ ENUM__SPEC_2(v5, v6)), \ ENUM__JOIN_2( \ ENUM__JOIN_STR_4(v1, v2, v3, v4), \ ENUM__JOIN_STR_2(v5, v6))) -/* Declare the necessary data structures for calling Enum_FlagsToString - * for an enum with 8 flags. */ +/* + * Declare the necessary data structures for calling Enum_FlagsToString + * for an enum with 8 flags. + */ #define ENUM_FLAGS_RTTI_8(typnam, v1, v2, v3, v4, v5, v6, v7, v8) \ ENUM__FLAGS_RTTI(typnam, \ ENUM__SPECS_2( \ ENUM__SPEC_4(v1, v2, v3, v4), \ ENUM__SPEC_4(v5, v6, v7, v8)), \ ENUM__JOIN_2( \ ENUM__JOIN_STR_4(v1, v2, v3, v4), \ ENUM__JOIN_STR_4(v5, v6, v7, v8))) -/* Declare the necessary data structures for calling Enum_ValueToString - * for an enum with 8 constants. */ +/* + * Declare the necessary data structures for calling Enum_ValueToString + * for an enum with 8 constants. + */ #define ENUM_VALUE_RTTI_8(typnam, v1, v2, v3, v4, v5, v6, v7, v8) \ ENUM__VALUE_RTTI(typnam, \ ENUM__SPECS_2( \ ENUM__SPEC_4(v1, v2, v3, v4), \ ENUM__SPEC_4(v5, v6, v7, v8))) -/* Declare the necessary data structures for calling Enum_FlagsToString - * for an enum with 10 flags. */ +/* + * Declare the necessary data structures for calling Enum_FlagsToString + * for an enum with 10 flags. + */ #define ENUM_FLAGS_RTTI_10(typnam, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) \ ENUM__FLAGS_RTTI(typnam, \ ENUM__SPECS_2( \ ENUM__SPEC_8(v1, v2, v3, v4, v5, v6, v7, v8), \ ENUM__SPEC_2(v9, v10)), \ ENUM__JOIN_2( \ ENUM__JOIN_STR_8(v1, v2, v3, v4, v5, v6, v7, v8), \ ENUM__JOIN_STR_2(v9, v10))) -/* Declare the necessary data structures for calling Enum_FlagsToString - * for an enum with 31 flags. */ +/* + * Declare the necessary data structures for calling Enum_FlagsToString + * for an enum with 31 flags. + */ #define ENUM_FLAGS_RTTI_31(typnam, \ v01, v02, v03, v04, v05, v06, v07, v08, \ v09, v10, v11, v12, v13, v14, v15, v16, \ v17, v18, v19, v20, v21, v22, v23, v24, \ v25, v26, v27, v28, v29, v30, v31) \ ENUM__FLAGS_RTTI(typnam, \ ENUM__SPECS_5( \ ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \ v09, v10, v11, v12, v13, v14, v15, v16), \ ENUM__SPEC_8(v17, v18, v19, v20, v21, v22, v23, v24), \ ENUM__SPEC_4(v25, v26, v27, v28), \ ENUM__SPEC_2(v29, v30), \ ENUM__SPEC_1(v31)), \ ENUM__JOIN_5( \ ENUM__JOIN_STR_16(v01, v02, v03, v04, v05, v06, v07, v08, \ v09, v10, v11, v12, v13, v14, v15, v16), \ ENUM__JOIN_STR_8(v17, v18, v19, v20, v21, v22, v23, v24), \ ENUM__JOIN_STR_4(v25, v26, v27, v28), \ ENUM__JOIN_STR_2(v29, v30), \ ENUM__JOIN_STR_1(v31))) -/* Declare the necessary data structures for calling Enum_FlagsToString - * for an enum with 32 flags. */ +/* + * Declare the necessary data structures for calling Enum_FlagsToString + * for an enum with 32 flags. + */ #define ENUM_FLAGS_RTTI_32(typnam, \ v01, v02, v03, v04, v05, v06, v07, v08, \ v09, v10, v11, v12, v13, v14, v15, v16, \ v17, v18, v19, v20, v21, v22, v23, v24, \ v25, v26, v27, v28, v29, v30, v31, v32) \ ENUM__FLAGS_RTTI(typnam, \ ENUM__SPECS_2( \ ENUM__SPEC_16(v01, v02, v03, v04, v05, v06, v07, v08, \ v09, v10, v11, v12, v13, v14, v15, v16), \ ENUM__SPEC_16(v17, v18, v19, v20, v21, v22, v23, v24, \ v25, v26, v27, v28, v29, v30, v31, v32)), \ ENUM__JOIN_2( \ ENUM__JOIN_STR_16(v01, v02, v03, v04, v05, v06, v07, v08, \ v09, v10, v11, v12, v13, v14, v15, v16), \ ENUM__JOIN_STR_16(v17, v18, v19, v20, v21, v22, v23, v24, \ v25, v26, v27, v28, v29, v30, v31, v32))) #endif diff --git a/filemon/filemon.h b/filemon/filemon.h index fcf37a3ab54b..4bd11bbde608 100644 --- a/filemon/filemon.h +++ b/filemon/filemon.h @@ -1,53 +1,53 @@ -/* $NetBSD: filemon.h,v 1.3 2020/10/18 11:49:47 rillig Exp $ */ +/* $NetBSD: filemon.h,v 1.4 2020/11/29 09:27:40 rillig Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Taylor R. Campbell. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifndef MAKE_FILEMON_H -#define MAKE_FILEMON_H +#define MAKE_FILEMON_H #include struct filemon; const char * filemon_path(void); struct filemon * filemon_open(void); int filemon_close(struct filemon *); int filemon_setfd(struct filemon *, int); void filemon_setpid_parent(struct filemon *, pid_t); int filemon_setpid_child(const struct filemon *, pid_t); int filemon_readfd(const struct filemon *); int filemon_process(struct filemon *); -#endif /* MAKE_FILEMON_H */ +#endif /* MAKE_FILEMON_H */ diff --git a/filemon/filemon_dev.c b/filemon/filemon_dev.c index afedb3c57e58..e4c583417b51 100644 --- a/filemon/filemon_dev.c +++ b/filemon/filemon_dev.c @@ -1,151 +1,151 @@ -/* $NetBSD: filemon_dev.c,v 1.4 2020/11/05 17:27:16 rillig Exp $ */ +/* $NetBSD: filemon_dev.c,v 1.6 2020/11/29 09:27:40 rillig Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Taylor R. Campbell. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include "filemon.h" #include #include #include #include #include #ifdef HAVE_FILEMON_H # include #endif #ifndef _PATH_FILEMON -#define _PATH_FILEMON "/dev/filemon" +#define _PATH_FILEMON "/dev/filemon" #endif struct filemon { int fd; }; const char * filemon_path(void) { return _PATH_FILEMON; } struct filemon * filemon_open(void) { struct filemon *F; unsigned i; int error; /* Allocate and zero a struct filemon object. */ F = calloc(1, sizeof *F); if (F == NULL) return NULL; /* Try opening /dev/filemon, up to six times (cargo cult!). */ for (i = 0; (F->fd = open(_PATH_FILEMON, O_RDWR|O_CLOEXEC)) == -1; i++) { if (i == 5) { error = errno; goto fail0; } } /* Success! */ return F; fail0: free(F); errno = error; return NULL; } int filemon_setfd(struct filemon *F, int fd) { /* Point the kernel at this file descriptor. */ if (ioctl(F->fd, FILEMON_SET_FD, &fd) == -1) return -1; /* No need for it in userland any more; close it. */ (void)close(fd); /* Success! */ return 0; } void filemon_setpid_parent(struct filemon *F, pid_t pid) { /* Nothing to do! */ } int filemon_setpid_child(const struct filemon *F, pid_t pid) { /* Just pass it on to the kernel. */ return ioctl(F->fd, FILEMON_SET_PID, &pid); } int filemon_close(struct filemon *F) { int error = 0; /* Close the filemon device fd. */ if (close(F->fd) == -1 && error == 0) error = errno; /* Free the filemon descriptor. */ free(F); /* Set errno and return -1 if anything went wrong. */ - if (error) { + if (error != 0) { errno = error; return -1; } /* Success! */ return 0; } int filemon_readfd(const struct filemon *F) { return -1; } int filemon_process(struct filemon *F) { return 0; } diff --git a/filemon/filemon_ktrace.c b/filemon/filemon_ktrace.c index 857e72e78028..699d66bad9f3 100644 --- a/filemon/filemon_ktrace.c +++ b/filemon/filemon_ktrace.c @@ -1,878 +1,885 @@ -/* $NetBSD: filemon_ktrace.c,v 1.4 2020/11/05 17:27:16 rillig Exp $ */ +/* $NetBSD: filemon_ktrace.c,v 1.12 2021/01/10 23:59:53 rillig Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Taylor R. Campbell. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#define _KERNTYPES /* register_t */ +#define _KERNTYPES /* register_t */ #include "filemon.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #ifndef AT_CWD #define AT_CWD -1 #endif struct filemon; struct filemon_key; struct filemon_state; typedef struct filemon_state *filemon_syscall_t(struct filemon *, const struct filemon_key *, const struct ktr_syscall *); static filemon_syscall_t filemon_sys_chdir; static filemon_syscall_t filemon_sys_execve; static filemon_syscall_t filemon_sys_exit; static filemon_syscall_t filemon_sys_fork; static filemon_syscall_t filemon_sys_link; static filemon_syscall_t filemon_sys_open; static filemon_syscall_t filemon_sys_openat; static filemon_syscall_t filemon_sys_symlink; static filemon_syscall_t filemon_sys_unlink; static filemon_syscall_t filemon_sys_rename; static filemon_syscall_t *const filemon_syscalls[] = { [SYS_chdir] = &filemon_sys_chdir, [SYS_execve] = &filemon_sys_execve, [SYS_exit] = &filemon_sys_exit, [SYS_fork] = &filemon_sys_fork, [SYS_link] = &filemon_sys_link, [SYS_open] = &filemon_sys_open, [SYS_openat] = &filemon_sys_openat, [SYS_symlink] = &filemon_sys_symlink, [SYS_unlink] = &filemon_sys_unlink, [SYS_rename] = &filemon_sys_rename, }; struct filemon { - int ktrfd; /* kernel writes ktrace events here */ - FILE *in; /* we read ktrace events from here */ - FILE *out; /* we write filemon events to here */ + int ktrfd; /* kernel writes ktrace events here */ + FILE *in; /* we read ktrace events from here */ + FILE *out; /* we write filemon events to here */ rb_tree_t active; pid_t child; /* I/O state machine. */ enum { FILEMON_START = 0, FILEMON_HEADER, FILEMON_PAYLOAD, FILEMON_ERROR, } state; unsigned char *p; size_t resid; /* I/O buffer. */ struct ktr_header hdr; union { struct ktr_syscall syscall; struct ktr_sysret sysret; char namei[PATH_MAX]; unsigned char buf[4096]; } payload; }; struct filemon_state { struct filemon_key { pid_t pid; lwpid_t lid; } key; struct rb_node node; int syscode; void (*show)(struct filemon *, const struct filemon_state *, const struct ktr_sysret *); unsigned i; unsigned npath; char *path[/*npath*/]; }; +/*ARGSUSED*/ static int compare_filemon_states(void *cookie, const void *na, const void *nb) { const struct filemon_state *Sa = na; const struct filemon_state *Sb = nb; if (Sa->key.pid < Sb->key.pid) return -1; if (Sa->key.pid > Sb->key.pid) return +1; if (Sa->key.lid < Sb->key.lid) return -1; if (Sa->key.lid > Sb->key.lid) return +1; return 0; } +/*ARGSUSED*/ static int compare_filemon_key(void *cookie, const void *n, const void *k) { const struct filemon_state *S = n; const struct filemon_key *key = k; if (S->key.pid < key->pid) return -1; if (S->key.pid > key->pid) return +1; if (S->key.lid < key->lid) return -1; if (S->key.lid > key->lid) return +1; return 0; } static const rb_tree_ops_t filemon_rb_ops = { .rbto_compare_nodes = &compare_filemon_states, .rbto_compare_key = &compare_filemon_key, .rbto_node_offset = offsetof(struct filemon_state, node), .rbto_context = NULL, }; /* * filemon_path() * * Return a pointer to a constant string denoting the `path' of * the filemon. */ const char * filemon_path(void) { return "ktrace"; } /* * filemon_open() * * Allocate a filemon descriptor. Returns NULL and sets errno on * failure. */ struct filemon * filemon_open(void) { struct filemon *F; int ktrpipe[2]; int error; /* Allocate and zero a struct filemon object. */ F = calloc(1, sizeof *F); if (F == NULL) return NULL; /* Create a pipe for ktrace events. */ if (pipe2(ktrpipe, O_CLOEXEC|O_NONBLOCK) == -1) { error = errno; goto fail0; } /* Create a file stream for reading the ktrace events. */ if ((F->in = fdopen(ktrpipe[0], "r")) == NULL) { error = errno; goto fail1; } ktrpipe[0] = -1; /* claimed by fdopen */ /* * Set the fd for writing ktrace events and initialize the * rbtree. The rest can be safely initialized to zero. */ F->ktrfd = ktrpipe[1]; rb_tree_init(&F->active, &filemon_rb_ops); /* Success! */ return F; -fail2: __unused (void)fclose(F->in); fail1: (void)close(ktrpipe[0]); (void)close(ktrpipe[1]); fail0: free(F); errno = error; return NULL; } /* * filemon_closefd(F) * * Internal subroutine to try to flush and close the output file. * If F is not open for output, do nothing. Never leaves F open * for output even on failure. Returns 0 on success; sets errno * and return -1 on failure. */ static int filemon_closefd(struct filemon *F) { int error = 0; /* If we're not open, nothing to do. */ if (F->out == NULL) return 0; /* * Flush it, close it, and null it unconditionally, but be * careful to return the earliest error in errno. */ if (fflush(F->out) == EOF && error == 0) error = errno; if (fclose(F->out) == EOF && error == 0) error = errno; F->out = NULL; /* Set errno and return -1 if anything went wrong. */ - if (error) { + if (error != 0) { errno = error; return -1; } /* Success! */ return 0; } /* * filemon_setfd(F, fd) * * Cause filemon activity on F to be sent to fd. Claims ownership * of fd; caller should not use fd afterward, and any duplicates * of fd may see their file positions changed. */ int filemon_setfd(struct filemon *F, int fd) { /* * Close an existing output file if done. Fail now if there's * an error closing. */ if ((filemon_closefd(F)) == -1) return -1; assert(F->out == NULL); /* Open a file stream and claim ownership of the fd. */ if ((F->out = fdopen(fd, "a")) == NULL) return -1; /* * Print the opening output. Any failure will be deferred * until closing. For hysterical raisins, we show the parent * pid, not the child pid. */ fprintf(F->out, "# filemon version 4\n"); fprintf(F->out, "# Target pid %jd\n", (intmax_t)getpid()); fprintf(F->out, "V 4\n"); /* Success! */ return 0; } /* * filemon_setpid_parent(F, pid) * * Set the traced pid, from the parent. Never fails. */ void filemon_setpid_parent(struct filemon *F, pid_t pid) { F->child = pid; } /* * filemon_setpid_child(F, pid) * * Set the traced pid, from the child. Returns 0 on success; sets * errno and returns -1 on failure. */ int filemon_setpid_child(const struct filemon *F, pid_t pid) { int ops, trpoints; ops = KTROP_SET|KTRFLAG_DESCEND; trpoints = KTRFACv2; trpoints |= KTRFAC_SYSCALL|KTRFAC_NAMEI|KTRFAC_SYSRET; trpoints |= KTRFAC_INHERIT; if (fktrace(F->ktrfd, ops, trpoints, pid) == -1) return -1; return 0; } /* * filemon_close(F) * * Close F for output if necessary, and free a filemon descriptor. * Returns 0 on success; sets errno and returns -1 on failure, but * frees the filemon descriptor either way; */ int filemon_close(struct filemon *F) { struct filemon_state *S; int error = 0; /* Close for output. */ if (filemon_closefd(F) == -1 && error == 0) error = errno; /* Close the ktrace pipe. */ if (fclose(F->in) == EOF && error == 0) error = errno; if (close(F->ktrfd) == -1 && error == 0) error = errno; /* Free any active records. */ while ((S = RB_TREE_MIN(&F->active)) != NULL) { rb_tree_remove_node(&F->active, S); free(S); } /* Free the filemon descriptor. */ free(F); /* Set errno and return -1 if anything went wrong. */ - if (error) { + if (error != 0) { errno = error; return -1; } /* Success! */ return 0; } /* * filemon_readfd(F) * * Returns a file descriptor which will select/poll ready for read * when there are filemon events to be processed by * filemon_process, or -1 if anything has gone wrong. */ int filemon_readfd(const struct filemon *F) { if (F->state == FILEMON_ERROR) return -1; return fileno(F->in); } /* * filemon_dispatch(F) * * Internal subroutine to dispatch a filemon ktrace event. * Silently ignore events that we don't recognize. */ static void filemon_dispatch(struct filemon *F) { const struct filemon_key key = { .pid = F->hdr.ktr_pid, .lid = F->hdr.ktr_lid, }; struct filemon_state *S; switch (F->hdr.ktr_type) { case KTR_SYSCALL: { struct ktr_syscall *call = &F->payload.syscall; struct filemon_state *S1; /* Validate the syscall code. */ if (call->ktr_code < 0 || (size_t)call->ktr_code >= __arraycount(filemon_syscalls) || filemon_syscalls[call->ktr_code] == NULL) break; /* * Invoke the syscall-specific logic to create a new * active state. */ S = (*filemon_syscalls[call->ktr_code])(F, &key, call); if (S == NULL) break; /* * Insert the active state, or ignore it if there * already is one. * * Collisions shouldn't happen because the states are * keyed by , in which syscalls should happen * sequentially in CALL/RET pairs, but let's be * defensive. */ S1 = rb_tree_insert_node(&F->active, S); if (S1 != S) { /* XXX Which one to drop? */ free(S); break; } break; } case KTR_NAMEI: /* Find an active syscall state, or drop it. */ S = rb_tree_find_node(&F->active, &key); if (S == NULL) break; /* Find the position of the next path, or drop it. */ if (S->i >= S->npath) break; /* Record the path. */ S->path[S->i++] = strndup(F->payload.namei, sizeof F->payload.namei); break; case KTR_SYSRET: { struct ktr_sysret *ret = &F->payload.sysret; unsigned i; /* Find and remove an active syscall state, or drop it. */ S = rb_tree_find_node(&F->active, &key); if (S == NULL) break; rb_tree_remove_node(&F->active, S); /* * If the active syscall state matches this return, * invoke the syscall-specific logic to show a filemon * event. */ /* XXX What to do if syscall code doesn't match? */ if (S->i == S->npath && S->syscode == ret->ktr_code) S->show(F, S, ret); /* Free the state now that it is no longer active. */ for (i = 0; i < S->i; i++) free(S->path[i]); free(S); break; } default: /* Ignore all other ktrace events. */ break; } } /* * filemon_process(F) * * Process all pending events after filemon_readfd(F) has * selected/polled ready for read. * * Returns -1 on failure, 0 on end of events, and anything else if * there may be more events. * * XXX What about fairness to other activities in the event loop? * If we stop while there's events buffered in F->in, then select * or poll may not return ready even though there's work queued up * in the buffer of F->in, but if we don't stop then ktrace events * may overwhelm all other activity in the event loop. */ int filemon_process(struct filemon *F) { size_t nread; top: /* If the child has exited, nothing to do. */ /* XXX What if one thread calls exit while another is running? */ if (F->child == 0) return 0; /* If we're waiting for input, read some. */ - if (F->resid) { + if (F->resid > 0) { nread = fread(F->p, 1, F->resid, F->in); if (nread == 0) { - if (feof(F->in)) + if (feof(F->in) != 0) return 0; - assert(ferror(F->in)); + assert(ferror(F->in) != 0); /* * If interrupted or would block, there may be * more events. Otherwise fail. */ if (errno == EAGAIN || errno == EINTR) return 1; F->state = FILEMON_ERROR; F->p = NULL; F->resid = 0; return -1; } assert(nread <= F->resid); F->p += nread; F->resid -= nread; - if (F->resid) /* may be more events */ + if (F->resid > 0) /* may be more events */ return 1; } /* Process a state transition now that we've read a buffer. */ switch (F->state) { case FILEMON_START: /* just started filemon; read header next */ F->state = FILEMON_HEADER; F->p = (void *)&F->hdr; F->resid = sizeof F->hdr; goto top; case FILEMON_HEADER: /* read header */ /* Sanity-check ktrace header; then read payload. */ if (F->hdr.ktr_len < 0 || (size_t)F->hdr.ktr_len > sizeof F->payload) { F->state = FILEMON_ERROR; F->p = NULL; F->resid = 0; errno = EIO; return -1; } F->state = FILEMON_PAYLOAD; F->p = (void *)&F->payload; F->resid = (size_t)F->hdr.ktr_len; goto top; case FILEMON_PAYLOAD: /* read header and payload */ /* Dispatch ktrace event; then read next header. */ filemon_dispatch(F); F->state = FILEMON_HEADER; F->p = (void *)&F->hdr; F->resid = sizeof F->hdr; goto top; default: /* paranoia */ F->state = FILEMON_ERROR; /*FALLTHROUGH*/ case FILEMON_ERROR: /* persistent error indicator */ F->p = NULL; F->resid = 0; errno = EIO; return -1; } } static struct filemon_state * -syscall_enter(struct filemon *F, +syscall_enter( const struct filemon_key *key, const struct ktr_syscall *call, unsigned npath, void (*show)(struct filemon *, const struct filemon_state *, const struct ktr_sysret *)) { struct filemon_state *S; unsigned i; S = calloc(1, offsetof(struct filemon_state, path[npath])); if (S == NULL) return NULL; S->key = *key; S->show = show; S->syscode = call->ktr_code; S->i = 0; S->npath = npath; for (i = 0; i < npath; i++) S->path[i] = NULL; /* paranoia */ return S; } static void show_paths(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret, const char *prefix) { unsigned i; /* Caller must ensure all paths have been specified. */ assert(S->i == S->npath); /* * Ignore it if it failed or yielded EJUSTRETURN (-2), or if * we're not producing output. */ - if (ret->ktr_error && ret->ktr_error != -2) + if (ret->ktr_error != 0 && ret->ktr_error != -2) return; if (F->out == NULL) return; /* * Print the prefix, pid, and paths -- with the paths quoted if * there's more than one. */ fprintf(F->out, "%s %jd", prefix, (intmax_t)S->key.pid); for (i = 0; i < S->npath; i++) { const char *q = S->npath > 1 ? "'" : ""; fprintf(F->out, " %s%s%s", q, S->path[i], q); } fprintf(F->out, "\n"); } static void show_retval(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret, const char *prefix) { /* * Ignore it if it failed or yielded EJUSTRETURN (-2), or if * we're not producing output. */ - if (ret->ktr_error && ret->ktr_error != -2) + if (ret->ktr_error != 0 && ret->ktr_error != -2) return; if (F->out == NULL) return; fprintf(F->out, "%s %jd %jd\n", prefix, (intmax_t)S->key.pid, (intmax_t)ret->ktr_retval); } static void show_chdir(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_paths(F, S, ret, "C"); } static void show_execve(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { - return show_paths(F, S, ret, "E"); + show_paths(F, S, ret, "E"); } static void show_fork(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_retval(F, S, ret, "F"); } static void show_link(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_paths(F, S, ret, "L"); /* XXX same as symlink */ } static void show_open_read(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_paths(F, S, ret, "R"); } static void show_open_write(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_paths(F, S, ret, "W"); } static void show_open_readwrite(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_paths(F, S, ret, "R"); show_paths(F, S, ret, "W"); } static void show_openat_read(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { if (S->path[0][0] != '/') show_paths(F, S, ret, "A"); show_paths(F, S, ret, "R"); } static void show_openat_write(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { if (S->path[0][0] != '/') show_paths(F, S, ret, "A"); show_paths(F, S, ret, "W"); } static void show_openat_readwrite(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { if (S->path[0][0] != '/') show_paths(F, S, ret, "A"); show_paths(F, S, ret, "R"); show_paths(F, S, ret, "W"); } static void show_symlink(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_paths(F, S, ret, "L"); /* XXX same as link */ } static void show_unlink(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_paths(F, S, ret, "D"); } static void show_rename(struct filemon *F, const struct filemon_state *S, const struct ktr_sysret *ret) { show_paths(F, S, ret, "M"); } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_chdir(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { - return syscall_enter(F, key, call, 1, &show_chdir); + return syscall_enter(key, call, 1, &show_chdir); } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_execve(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { - return syscall_enter(F, key, call, 1, &show_execve); + return syscall_enter(key, call, 1, &show_execve); } static struct filemon_state * filemon_sys_exit(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { const register_t *args = (const void *)&call[1]; int status = (int)args[0]; - if (F->out) { + if (F->out != NULL) { fprintf(F->out, "X %jd %d\n", (intmax_t)key->pid, status); if (key->pid == F->child) { fprintf(F->out, "# Bye bye\n"); F->child = 0; } } return NULL; } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_fork(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { - return syscall_enter(F, key, call, 0, &show_fork); + return syscall_enter(key, call, 0, &show_fork); } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_link(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { - return syscall_enter(F, key, call, 2, &show_link); + return syscall_enter(key, call, 2, &show_link); } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_open(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { const register_t *args = (const void *)&call[1]; int flags; if (call->ktr_argsize < 2) return NULL; flags = (int)args[1]; if ((flags & O_RDWR) == O_RDWR) - return syscall_enter(F, key, call, 1, &show_open_readwrite); + return syscall_enter(key, call, 1, &show_open_readwrite); else if ((flags & O_WRONLY) == O_WRONLY) - return syscall_enter(F, key, call, 1, &show_open_write); + return syscall_enter(key, call, 1, &show_open_write); else if ((flags & O_RDONLY) == O_RDONLY) - return syscall_enter(F, key, call, 1, &show_open_read); + return syscall_enter(key, call, 1, &show_open_read); else return NULL; /* XXX Do we care if no read or write? */ } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_openat(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { const register_t *args = (const void *)&call[1]; int flags, fd; if (call->ktr_argsize < 3) return NULL; fd = (int)args[0]; flags = (int)args[2]; if (fd == AT_CWD) { if ((flags & O_RDWR) == O_RDWR) - return syscall_enter(F, key, call, 1, + return syscall_enter(key, call, 1, &show_open_readwrite); else if ((flags & O_WRONLY) == O_WRONLY) - return syscall_enter(F, key, call, 1, - &show_open_write); + return syscall_enter(key, call, 1, &show_open_write); else if ((flags & O_RDONLY) == O_RDONLY) - return syscall_enter(F, key, call, 1, &show_open_read); + return syscall_enter(key, call, 1, &show_open_read); else return NULL; } else { if ((flags & O_RDWR) == O_RDWR) - return syscall_enter(F, key, call, 1, + return syscall_enter(key, call, 1, &show_openat_readwrite); else if ((flags & O_WRONLY) == O_WRONLY) - return syscall_enter(F, key, call, 1, - &show_openat_write); + return syscall_enter(key, call, 1, &show_openat_write); else if ((flags & O_RDONLY) == O_RDONLY) - return syscall_enter(F, key, call, 1, - &show_openat_read); + return syscall_enter(key, call, 1, &show_openat_read); else return NULL; } } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_symlink(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { - return syscall_enter(F, key, call, 2, &show_symlink); + return syscall_enter(key, call, 2, &show_symlink); } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_unlink(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { - return syscall_enter(F, key, call, 1, &show_unlink); + return syscall_enter(key, call, 1, &show_unlink); } +/*ARGSUSED*/ static struct filemon_state * filemon_sys_rename(struct filemon *F, const struct filemon_key *key, const struct ktr_syscall *call) { - return syscall_enter(F, key, call, 2, &show_rename); + return syscall_enter(key, call, 2, &show_rename); } diff --git a/for.c b/for.c index 8730ab5c157d..af55179dee8d 100644 --- a/for.c +++ b/for.c @@ -1,479 +1,504 @@ -/* $NetBSD: for.c,v 1.115 2020/11/07 21:04:43 rillig Exp $ */ +/* $NetBSD: for.c,v 1.134 2021/01/10 21:20:46 rillig Exp $ */ /* * Copyright (c) 1992, The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /*- * Handling of .for/.endfor loops in a makefile. * - * For loops are of the form: + * For loops have the form: * - * .for in - * ... - * .endfor - * - * When a .for line is parsed, all following lines are accumulated into a - * buffer, up to but excluding the corresponding .endfor line. To find the - * corresponding .endfor, the number of nested .for and .endfor directives - * are counted. + * .for in + * # the body + * .endfor * - * During parsing, any nested .for loops are just passed through; they get - * handled recursively in For_Eval when the enclosing .for loop is evaluated - * in For_Run. + * When a .for line is parsed, the following lines are copied to the body of + * the .for loop, until the corresponding .endfor line is reached. In this + * phase, the body is not yet evaluated. This also applies to any nested + * .for loops. * - * When the .for loop has been parsed completely, the variable expressions - * for the iteration variables are replaced with expressions of the form - * ${:Uvalue}, and then this modified body is "included" as a special file. + * After reaching the .endfor, the values from the .for line are grouped + * according to the number of variables. For each such group, the unexpanded + * body is scanned for variable expressions, and those that match the variable + * names are replaced with expressions of the form ${:U...} or $(:U...). + * After that, the body is treated like a file from an .include directive. * * Interface: * For_Eval Evaluate the loop in the passed line. * * For_Run Run accumulated loop */ #include "make.h" /* "@(#)for.c 8.1 (Berkeley) 6/6/93" */ -MAKE_RCSID("$NetBSD: for.c,v 1.115 2020/11/07 21:04:43 rillig Exp $"); +MAKE_RCSID("$NetBSD: for.c,v 1.134 2021/01/10 21:20:46 rillig Exp $"); static int forLevel = 0; /* Nesting level */ /* One of the variables to the left of the "in" in a .for loop. */ typedef struct ForVar { - char *name; - size_t len; + char *name; + size_t nameLen; } ForVar; /* * State of a for loop. */ typedef struct For { - Buffer body; /* Unexpanded body of the loop */ - Vector /* of ForVar */ vars; /* Iteration variables */ - Words items; /* Substitution items */ - Buffer curBody; /* Expanded body of the current iteration */ - /* Is any of the names 1 character long? If so, when the variable values - * are substituted, the parser must handle $V expressions as well, not - * only ${V} and $(V). */ - Boolean short_var; - unsigned int sub_next; /* Where to continue iterating */ + Buffer body; /* Unexpanded body of the loop */ + Vector /* of ForVar */ vars; /* Iteration variables */ + Words items; /* Substitution items */ + Buffer curBody; /* Expanded body of the current iteration */ + /* Is any of the names 1 character long? If so, when the variable values + * are substituted, the parser must handle $V expressions as well, not + * only ${V} and $(V). */ + Boolean short_var; + unsigned int sub_next; /* Where to continue iterating */ } For; static For *accumFor; /* Loop being accumulated */ static void ForAddVar(For *f, const char *name, size_t len) { - ForVar *var = Vector_Push(&f->vars); - var->name = bmake_strldup(name, len); - var->len = len; + ForVar *var = Vector_Push(&f->vars); + var->name = bmake_strldup(name, len); + var->nameLen = len; } static void For_Free(For *f) { - Buf_Destroy(&f->body, TRUE); + Buf_Destroy(&f->body, TRUE); - while (f->vars.len > 0) { - ForVar *var = Vector_Pop(&f->vars); - free(var->name); - } - Vector_Done(&f->vars); + while (f->vars.len > 0) { + ForVar *var = Vector_Pop(&f->vars); + free(var->name); + } + Vector_Done(&f->vars); - Words_Free(f->items); - Buf_Destroy(&f->curBody, TRUE); + Words_Free(f->items); + Buf_Destroy(&f->curBody, TRUE); - free(f); + free(f); } static Boolean IsFor(const char *p) { - return p[0] == 'f' && p[1] == 'o' && p[2] == 'r' && ch_isspace(p[3]); + return p[0] == 'f' && p[1] == 'o' && p[2] == 'r' && ch_isspace(p[3]); } static Boolean IsEndfor(const char *p) { - return p[0] == 'e' && strncmp(p, "endfor", 6) == 0 && - (p[6] == '\0' || ch_isspace(p[6])); + return p[0] == 'e' && strncmp(p, "endfor", 6) == 0 && + (p[6] == '\0' || ch_isspace(p[6])); } -/* Evaluate the for loop in the passed line. The line looks like this: +/* + * Evaluate the for loop in the passed line. The line looks like this: * .for in * * Input: * line Line to parse * * Results: * 0: Not a .for statement, parse the line * 1: We found a for loop * -1: A .for statement with a bad syntax error, discard. */ int For_Eval(const char *line) { - For *f; - const char *p; + For *f; + const char *p; - p = line + 1; /* skip the '.' */ - cpp_skip_whitespace(&p); + p = line + 1; /* skip the '.' */ + cpp_skip_whitespace(&p); - if (!IsFor(p)) { - if (IsEndfor(p)) { - Parse_Error(PARSE_FATAL, "for-less endfor"); - return -1; + if (!IsFor(p)) { + if (IsEndfor(p)) { + Parse_Error(PARSE_FATAL, "for-less endfor"); + return -1; + } + return 0; + } + p += 3; + + /* + * we found a for loop, and now we are going to parse it. + */ + + f = bmake_malloc(sizeof *f); + Buf_Init(&f->body); + Vector_Init(&f->vars, sizeof(ForVar)); + f->items.words = NULL; + f->items.freeIt = NULL; + Buf_Init(&f->curBody); + f->short_var = FALSE; + f->sub_next = 0; + + /* Grab the variables. Terminate on "in". */ + for (;;) { + size_t len; + + cpp_skip_whitespace(&p); + if (*p == '\0') { + Parse_Error(PARSE_FATAL, "missing `in' in for"); + For_Free(f); + return -1; + } + + /* + * XXX: This allows arbitrary variable names; + * see directive-for.mk. + */ + for (len = 1; p[len] != '\0' && !ch_isspace(p[len]); len++) + continue; + + if (len == 2 && p[0] == 'i' && p[1] == 'n') { + p += 2; + break; + } + if (len == 1) + f->short_var = TRUE; + + ForAddVar(f, p, len); + p += len; } - return 0; - } - p += 3; - - /* - * we found a for loop, and now we are going to parse it. - */ - - f = bmake_malloc(sizeof *f); - Buf_Init(&f->body); - Vector_Init(&f->vars, sizeof(ForVar)); - f->items.words = NULL; - f->items.freeIt = NULL; - Buf_Init(&f->curBody); - f->short_var = FALSE; - f->sub_next = 0; - - /* Grab the variables. Terminate on "in". */ - for (;;) { - size_t len; - cpp_skip_whitespace(&p); - if (*p == '\0') { - Parse_Error(PARSE_FATAL, "missing `in' in for"); - For_Free(f); - return -1; + if (f->vars.len == 0) { + Parse_Error(PARSE_FATAL, "no iteration variables in for"); + For_Free(f); + return -1; } - /* XXX: This allows arbitrary variable names; see directive-for.mk. */ - for (len = 1; p[len] != '\0' && !ch_isspace(p[len]); len++) - continue; + cpp_skip_whitespace(&p); + + { + char *items; + if (Var_Subst(p, VAR_GLOBAL, VARE_WANTRES, &items) != VPR_OK) { + Parse_Error(PARSE_FATAL, "Error in .for loop items"); + f->items.len = 0; + goto done; + } + + f->items = Str_Words(items, FALSE); + free(items); - if (len == 2 && p[0] == 'i' && p[1] == 'n') { - p += 2; - break; + if (f->items.len == 1 && f->items.words[0][0] == '\0') + f->items.len = 0; /* .for var in ${:U} */ } - if (len == 1) - f->short_var = TRUE; - - ForAddVar(f, p, len); - p += len; - } - - if (f->vars.len == 0) { - Parse_Error(PARSE_FATAL, "no iteration variables in for"); - For_Free(f); - return -1; - } - - cpp_skip_whitespace(&p); - - { - char *items; - (void)Var_Subst(p, VAR_GLOBAL, VARE_WANTRES, &items); - /* TODO: handle errors */ - f->items = Str_Words(items, FALSE); - free(items); - - if (f->items.len == 1 && f->items.words[0][0] == '\0') - f->items.len = 0; /* .for var in ${:U} */ - } - - { - size_t nitems, nvars; - - if ((nitems = f->items.len) > 0 && nitems % (nvars = f->vars.len)) { - Parse_Error(PARSE_FATAL, - "Wrong number of words (%zu) in .for substitution list" - " with %zu variables", nitems, nvars); - /* - * Return 'success' so that the body of the .for loop is - * accumulated. - * Remove all items so that the loop doesn't iterate. - */ - f->items.len = 0; + + { + size_t nitems, nvars; + + if ((nitems = f->items.len) > 0 && + nitems % (nvars = f->vars.len) != 0) { + Parse_Error(PARSE_FATAL, + "Wrong number of words (%u) in .for " + "substitution list with %u variables", + (unsigned)nitems, (unsigned)nvars); + /* + * Return 'success' so that the body of the .for loop + * is accumulated. + * Remove all items so that the loop doesn't iterate. + */ + f->items.len = 0; + } } - } - accumFor = f; - forLevel = 1; - return 1; +done: + accumFor = f; + forLevel = 1; + return 1; } /* * Add another line to a .for loop. * Returns FALSE when the matching .endfor is reached. */ Boolean For_Accum(const char *line) { - const char *ptr = line; - - if (*ptr == '.') { - ptr++; - cpp_skip_whitespace(&ptr); - - if (IsEndfor(ptr)) { - DEBUG1(FOR, "For: end for %d\n", forLevel); - if (--forLevel <= 0) - return FALSE; - } else if (IsFor(ptr)) { - forLevel++; - DEBUG1(FOR, "For: new loop %d\n", forLevel); + const char *ptr = line; + + if (*ptr == '.') { + ptr++; + cpp_skip_whitespace(&ptr); + + if (IsEndfor(ptr)) { + DEBUG1(FOR, "For: end for %d\n", forLevel); + if (--forLevel <= 0) + return FALSE; + } else if (IsFor(ptr)) { + forLevel++; + DEBUG1(FOR, "For: new loop %d\n", forLevel); + } } - } - Buf_AddStr(&accumFor->body, line); - Buf_AddByte(&accumFor->body, '\n'); - return TRUE; + Buf_AddStr(&accumFor->body, line); + Buf_AddByte(&accumFor->body, '\n'); + return TRUE; } static size_t for_var_len(const char *var) { - char ch, var_start, var_end; - int depth; - size_t len; - - var_start = *var; - if (var_start == '\0') - /* just escape the $ */ - return 0; - - if (var_start == '(') - var_end = ')'; - else if (var_start == '{') - var_end = '}'; - else - /* Single char variable */ - return 1; + char ch, var_start, var_end; + int depth; + size_t len; - depth = 1; - for (len = 1; (ch = var[len++]) != '\0';) { - if (ch == var_start) - depth++; - else if (ch == var_end && --depth == 0) - return len; - } + var_start = *var; + if (var_start == '\0') + /* just escape the $ */ + return 0; + + if (var_start == '(') + var_end = ')'; + else if (var_start == '{') + var_end = '}'; + else + return 1; /* Single char variable */ + + depth = 1; + for (len = 1; (ch = var[len++]) != '\0';) { + if (ch == var_start) + depth++; + else if (ch == var_end && --depth == 0) + return len; + } - /* Variable end not found, escape the $ */ - return 0; + /* Variable end not found, escape the $ */ + return 0; } -/* The .for loop substitutes the items as ${:U...}, which means - * that characters that break this syntax must be backslash-escaped. */ +/* + * The .for loop substitutes the items as ${:U...}, which means + * that characters that break this syntax must be backslash-escaped. + */ static Boolean NeedsEscapes(const char *word, char endc) { - const char *p; + const char *p; - for (p = word; *p != '\0'; p++) { - if (*p == ':' || *p == '$' || *p == '\\' || *p == endc) - return TRUE; - } - return FALSE; + for (p = word; *p != '\0'; p++) { + if (*p == ':' || *p == '$' || *p == '\\' || *p == endc) + return TRUE; + } + return FALSE; } -/* While expanding the body of a .for loop, write the item in the ${:U...} +/* + * While expanding the body of a .for loop, write the item in the ${:U...} * expression, escaping characters as needed. * - * The result is later unescaped by ApplyModifier_Defined. */ + * The result is later unescaped by ApplyModifier_Defined. + */ static void -Buf_AddEscaped(Buffer *cmds, const char *item, char ech) +Buf_AddEscaped(Buffer *cmds, const char *item, char endc) { - char ch; + char ch; - if (!NeedsEscapes(item, ech)) { - Buf_AddStr(cmds, item); - return; - } - - /* Escape ':', '$', '\\' and 'ech' - these will be removed later by - * :U processing, see ApplyModifier_Defined. */ - while ((ch = *item++) != '\0') { - if (ch == '$') { - size_t len = for_var_len(item); - if (len != 0) { - Buf_AddBytes(cmds, item - 1, len + 1); - item += len; - continue; - } - Buf_AddByte(cmds, '\\'); - } else if (ch == ':' || ch == '\\' || ch == ech) - Buf_AddByte(cmds, '\\'); - Buf_AddByte(cmds, ch); - } + if (!NeedsEscapes(item, endc)) { + Buf_AddStr(cmds, item); + return; + } + + /* Escape ':', '$', '\\' and 'endc' - these will be removed later by + * :U processing, see ApplyModifier_Defined. */ + while ((ch = *item++) != '\0') { + if (ch == '$') { + size_t len = for_var_len(item); + if (len != 0) { + Buf_AddBytes(cmds, item - 1, len + 1); + item += len; + continue; + } + Buf_AddByte(cmds, '\\'); + } else if (ch == ':' || ch == '\\' || ch == endc) + Buf_AddByte(cmds, '\\'); + Buf_AddByte(cmds, ch); + } } -/* While expanding the body of a .for loop, replace expressions like - * ${i}, ${i:...}, $(i) or $(i:...) with their ${:U...} expansion. */ +/* + * While expanding the body of a .for loop, replace the variable name of an + * expression like ${i} or ${i:...} or $(i) or $(i:...) with ":Uvalue". + */ static void -SubstVarLong(For *f, const char **pp, const char **inout_mark, char ech) +SubstVarLong(For *f, const char **pp, const char *bodyEnd, char endc, + const char **inout_mark) { - size_t i; - const char *p = *pp; - - for (i = 0; i < f->vars.len; i++) { - ForVar *forVar = Vector_Get(&f->vars, i); - char *var = forVar->name; - size_t vlen = forVar->len; - - /* XXX: undefined behavior for p if vlen is longer than p? */ - if (memcmp(p, var, vlen) != 0) - continue; - /* XXX: why test for backslash here? */ - if (p[vlen] != ':' && p[vlen] != ech && p[vlen] != '\\') - continue; - - /* Found a variable match. Replace with :U */ - Buf_AddBytesBetween(&f->curBody, *inout_mark, p); - Buf_AddStr(&f->curBody, ":U"); - Buf_AddEscaped(&f->curBody, f->items.words[f->sub_next + i], ech); - - p += vlen; - *inout_mark = p; - break; - } - - *pp = p; + size_t i; + const char *p = *pp; + + for (i = 0; i < f->vars.len; i++) { + ForVar *forVar = Vector_Get(&f->vars, i); + char *varname = forVar->name; + size_t varnameLen = forVar->nameLen; + + if (varnameLen >= (size_t)(bodyEnd - p)) + continue; + if (memcmp(p, varname, varnameLen) != 0) + continue; + /* XXX: why test for backslash here? */ + if (p[varnameLen] != ':' && p[varnameLen] != endc && + p[varnameLen] != '\\') + continue; + + /* + * Found a variable match. Skip over the variable name and + * instead add ':U' to the current body. + */ + Buf_AddBytesBetween(&f->curBody, *inout_mark, p); + Buf_AddStr(&f->curBody, ":U"); + Buf_AddEscaped(&f->curBody, + f->items.words[f->sub_next + i], endc); + + p += varnameLen; + *inout_mark = p; + *pp = p; + return; + } } -/* While expanding the body of a .for loop, replace single-character - * variable expressions like $i with their ${:U...} expansion. */ +/* + * While expanding the body of a .for loop, replace single-character + * variable expressions like $i with their ${:U...} expansion. + */ static void -SubstVarShort(For *f, char const ch, const char **pp, const char **inout_mark) +SubstVarShort(For *f, const char *p, const char **inout_mark) { - const char *p = *pp; - size_t i; - - /* Probably a single character name, ignore $$ and stupid ones. */ - if (!f->short_var || strchr("}):$", ch) != NULL) { - p++; - *pp = p; + const char ch = *p; + ForVar *vars; + size_t i; + + /* Skip $$ and stupid ones. */ + if (!f->short_var || strchr("}):$", ch) != NULL) + return; + + vars = Vector_Get(&f->vars, 0); + for (i = 0; i < f->vars.len; i++) { + const char *varname = vars[i].name; + if (varname[0] == ch && varname[1] == '\0') + goto found; + } return; - } - - for (i = 0; i < f->vars.len; i++) { - ForVar *var = Vector_Get(&f->vars, i); - const char *varname = var->name; - if (varname[0] != ch || varname[1] != '\0') - continue; - /* Found a variable match. Replace with ${:U} */ - Buf_AddBytesBetween(&f->curBody, *inout_mark, p); +found: + /* Replace $ with ${:U} */ + Buf_AddBytesBetween(&f->curBody, *inout_mark, p), *inout_mark = p + 1; Buf_AddStr(&f->curBody, "{:U"); Buf_AddEscaped(&f->curBody, f->items.words[f->sub_next + i], '}'); Buf_AddByte(&f->curBody, '}'); - - *inout_mark = ++p; - break; - } - - *pp = p; } /* - * Scan the for loop body and replace references to the loop variables - * with variable references that expand to the required text. + * Compute the body for the current iteration by copying the unexpanded body, + * replacing the expressions for the iteration variables on the way. * - * Using variable expansions ensures that the .for loop can't generate + * Using variable expressions ensures that the .for loop can't generate * syntax, and that the later parsing will still see a variable. - * We assume that the null variable will never be defined. + * This code assumes that the variable with the empty name will never be + * defined, see unit-tests/varname-empty.mk for more details. * * The detection of substitutions of the loop control variable is naive. * Many of the modifiers use \ to escape $ (not $) so it is possible * to contrive a makefile where an unwanted substitution happens. */ -static char * -ForIterate(void *v_arg, size_t *out_len) +static void +ForSubstBody(For *f) { - For *f = v_arg; - const char *p; - const char *mark; /* where the last replacement left off */ - const char *body_end; - char *cmds_str; - - if (f->sub_next + f->vars.len > f->items.len) { - /* No more iterations */ - For_Free(f); - return NULL; - } - - Buf_Empty(&f->curBody); - - mark = Buf_GetAll(&f->body, NULL); - body_end = mark + Buf_Len(&f->body); - for (p = mark; (p = strchr(p, '$')) != NULL;) { - char ch, ech; - ch = *++p; - if ((ch == '(' && (ech = ')', 1)) || (ch == '{' && (ech = '}', 1))) { - p++; - /* Check variable name against the .for loop variables */ - SubstVarLong(f, &p, &mark, ech); - continue; + const char *p, *bodyEnd; + const char *mark; /* where the last replacement left off */ + + Buf_Empty(&f->curBody); + + mark = f->body.data; + bodyEnd = f->body.data + f->body.len; + for (p = mark; (p = strchr(p, '$')) != NULL;) { + if (p[1] == '{' || p[1] == '(') { + p += 2; + SubstVarLong(f, &p, bodyEnd, p[-1] == '{' ? '}' : ')', + &mark); + } else if (p[1] != '\0') { + SubstVarShort(f, p + 1, &mark); + p += 2; + } else + break; } - if (ch == '\0') - break; - SubstVarShort(f, ch, &p, &mark); - } - Buf_AddBytesBetween(&f->curBody, mark, body_end); + Buf_AddBytesBetween(&f->curBody, mark, bodyEnd); +} - *out_len = Buf_Len(&f->curBody); - cmds_str = Buf_GetAll(&f->curBody, NULL); - DEBUG1(FOR, "For: loop body:\n%s", cmds_str); +/* + * Compute the body for the current iteration by copying the unexpanded body, + * replacing the expressions for the iteration variables on the way. + */ +static char * +ForReadMore(void *v_arg, size_t *out_len) +{ + For *f = v_arg; + + if (f->sub_next == f->items.len) { + /* No more iterations */ + For_Free(f); + return NULL; + } - f->sub_next += f->vars.len; + ForSubstBody(f); + DEBUG1(FOR, "For: loop body:\n%s", f->curBody.data); + f->sub_next += (unsigned int)f->vars.len; - return cmds_str; + *out_len = f->curBody.len; + return f->curBody.data; } -/* Run the for loop, imitating the actions of an include file. */ +/* Run the .for loop, imitating the actions of an include file. */ void For_Run(int lineno) { - For *f = accumFor; - accumFor = NULL; - - if (f->items.len == 0) { - /* Nothing to expand - possibly due to an earlier syntax error. */ - For_Free(f); - return; - } + For *f = accumFor; + accumFor = NULL; + + if (f->items.len == 0) { + /* + * Nothing to expand - possibly due to an earlier syntax + * error. + */ + For_Free(f); + return; + } - Parse_SetInput(NULL, lineno, -1, ForIterate, f); + Parse_SetInput(NULL, lineno, -1, ForReadMore, f); } diff --git a/hash.c b/hash.c index a1e3ad3b45b4..82735f59c6fd 100644 --- a/hash.c +++ b/hash.c @@ -1,318 +1,329 @@ -/* $NetBSD: hash.c,v 1.57 2020/11/14 21:29:44 rillig Exp $ */ +/* $NetBSD: hash.c,v 1.60 2020/12/30 10:03:16 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* Hash tables with string keys. */ #include "make.h" /* "@(#)hash.c 8.1 (Berkeley) 6/6/93" */ -MAKE_RCSID("$NetBSD: hash.c,v 1.57 2020/11/14 21:29:44 rillig Exp $"); +MAKE_RCSID("$NetBSD: hash.c,v 1.60 2020/12/30 10:03:16 rillig Exp $"); /* * The ratio of # entries to # buckets at which we rebuild the table to * make it larger. */ #define rebuildLimit 3 /* This hash function matches Gosling's emacs and java.lang.String. */ static unsigned int hash(const char *key, size_t *out_keylen) { - unsigned int h = 0; - const char *p = key; - while (*p != '\0') - h = (h << 5) - h + (unsigned char)*p++; + unsigned int h; + const char *p; + + h = 0; + for (p = key; *p != '\0'; p++) + h = 31 * h + (unsigned char)*p; + if (out_keylen != NULL) *out_keylen = (size_t)(p - key); return h; } unsigned int Hash_Hash(const char *key) { - return hash(key, NULL); + return hash(key, NULL); } static HashEntry * HashTable_Find(HashTable *t, unsigned int h, const char *key) { HashEntry *e; unsigned int chainlen = 0; #ifdef DEBUG_HASH_LOOKUP DEBUG4(HASH, "%s: %p h=%08x key=%s\n", __func__, t, h, key); #endif for (e = t->buckets[h & t->bucketsMask]; e != NULL; e = e->next) { chainlen++; if (e->key_hash == h && strcmp(e->key, key) == 0) break; } if (chainlen > t->maxchain) t->maxchain = chainlen; return e; } /* Set up the hash table. */ void HashTable_Init(HashTable *t) { unsigned int n = 16, i; HashEntry **buckets = bmake_malloc(sizeof *buckets * n); for (i = 0; i < n; i++) buckets[i] = NULL; t->buckets = buckets; t->bucketsSize = n; t->numEntries = 0; t->bucketsMask = n - 1; t->maxchain = 0; } /* Remove everything from the hash table and frees up the memory. */ void HashTable_Done(HashTable *t) { HashEntry **buckets = t->buckets; size_t i, n = t->bucketsSize; for (i = 0; i < n; i++) { HashEntry *he = buckets[i]; while (he != NULL) { HashEntry *next = he->next; free(he); he = next; } } free(t->buckets); #ifdef CLEANUP t->buckets = NULL; #endif } /* Find the entry corresponding to the key, or return NULL. */ HashEntry * HashTable_FindEntry(HashTable *t, const char *key) { unsigned int h = hash(key, NULL); return HashTable_Find(t, h, key); } /* Find the value corresponding to the key, or return NULL. */ void * HashTable_FindValue(HashTable *t, const char *key) { HashEntry *he = HashTable_FindEntry(t, key); return he != NULL ? he->value : NULL; } -/* Find the value corresponding to the key and the precomputed hash, - * or return NULL. */ +/* + * Find the value corresponding to the key and the precomputed hash, + * or return NULL. + */ void * HashTable_FindValueHash(HashTable *t, const char *key, unsigned int h) { HashEntry *he = HashTable_Find(t, h, key); return he != NULL ? he->value : NULL; } -/* Make the hash table larger. Any bucket numbers from the old table become - * invalid; the hash codes stay valid though. */ +/* + * Make the hash table larger. Any bucket numbers from the old table become + * invalid; the hash codes stay valid though. + */ static void HashTable_Enlarge(HashTable *t) { unsigned int oldSize = t->bucketsSize; HashEntry **oldBuckets = t->buckets; unsigned int newSize = 2 * oldSize; unsigned int newMask = newSize - 1; HashEntry **newBuckets = bmake_malloc(sizeof *newBuckets * newSize); size_t i; for (i = 0; i < newSize; i++) newBuckets[i] = NULL; for (i = 0; i < oldSize; i++) { HashEntry *he = oldBuckets[i]; while (he != NULL) { HashEntry *next = he->next; he->next = newBuckets[he->key_hash & newMask]; newBuckets[he->key_hash & newMask] = he; he = next; } } free(oldBuckets); t->bucketsSize = newSize; t->bucketsMask = newMask; t->buckets = newBuckets; DEBUG5(HASH, "%s: %p size=%d entries=%d maxchain=%d\n", __func__, t, t->bucketsSize, t->numEntries, t->maxchain); t->maxchain = 0; } -/* Find or create an entry corresponding to the key. - * Return in out_isNew whether a new entry has been created. */ +/* + * Find or create an entry corresponding to the key. + * Return in out_isNew whether a new entry has been created. + */ HashEntry * HashTable_CreateEntry(HashTable *t, const char *key, Boolean *out_isNew) { size_t keylen; unsigned int h = hash(key, &keylen); HashEntry *he = HashTable_Find(t, h, key); if (he != NULL) { if (out_isNew != NULL) *out_isNew = FALSE; return he; } if (t->numEntries >= rebuildLimit * t->bucketsSize) HashTable_Enlarge(t); he = bmake_malloc(sizeof *he + keylen); he->value = NULL; he->key_hash = h; memcpy(he->key, key, keylen + 1); he->next = t->buckets[h & t->bucketsMask]; t->buckets[h & t->bucketsMask] = he; t->numEntries++; if (out_isNew != NULL) *out_isNew = TRUE; return he; } HashEntry * HashTable_Set(HashTable *t, const char *key, void *value) { HashEntry *he = HashTable_CreateEntry(t, key, NULL); HashEntry_Set(he, value); return he; } /* Delete the entry from the table and free the associated memory. */ void HashTable_DeleteEntry(HashTable *t, HashEntry *he) { HashEntry **ref = &t->buckets[he->key_hash & t->bucketsMask]; HashEntry *p; for (; (p = *ref) != NULL; ref = &p->next) { if (p == he) { *ref = p->next; free(p); t->numEntries--; return; } } abort(); } /* Set things up for iterating over all entries in the hash table. */ void HashIter_Init(HashIter *hi, HashTable *t) { hi->table = t; hi->nextBucket = 0; hi->entry = NULL; } -/* Return the next entry in the hash table, or NULL if the end of the table - * is reached. */ +/* + * Return the next entry in the hash table, or NULL if the end of the table + * is reached. + */ HashEntry * HashIter_Next(HashIter *hi) { HashTable *t = hi->table; HashEntry *he = hi->entry; HashEntry **buckets = t->buckets; unsigned int bucketsSize = t->bucketsSize; if (he != NULL) he = he->next; /* skip the most recently returned entry */ while (he == NULL) { /* find the next nonempty chain */ if (hi->nextBucket >= bucketsSize) return NULL; he = buckets[hi->nextBucket++]; } hi->entry = he; return he; } void HashTable_DebugStats(HashTable *t, const char *name) { DEBUG4(HASH, "HashTable %s: size=%u numEntries=%u maxchain=%u\n", name, t->bucketsSize, t->numEntries, t->maxchain); } diff --git a/hash.h b/hash.h index 30a8485bbd2e..b101137aa0ce 100644 --- a/hash.h +++ b/hash.h @@ -1,132 +1,170 @@ -/* $NetBSD: hash.h,v 1.33 2020/11/14 21:29:44 rillig Exp $ */ +/* $NetBSD: hash.h,v 1.38 2020/12/15 01:23:55 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)hash.h 8.1 (Berkeley) 6/6/93 */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)hash.h 8.1 (Berkeley) 6/6/93 */ /* Hash tables with strings as keys and arbitrary pointers as values. */ -#ifndef MAKE_HASH_H -#define MAKE_HASH_H +#ifndef MAKE_HASH_H +#define MAKE_HASH_H /* A single key-value entry in the hash table. */ typedef struct HashEntry { - struct HashEntry *next; /* Used to link together all the entries + struct HashEntry *next; /* Used to link together all the entries * associated with the same bucket. */ - void *value; - unsigned int key_hash; /* hash value of the key */ - char key[1]; /* key string, variable length */ + void *value; + unsigned int key_hash; /* hash value of the key */ + char key[1]; /* key string, variable length */ } HashEntry; /* The hash table containing the entries. */ typedef struct HashTable { - HashEntry **buckets; /* Pointers to HashEntry, one + HashEntry **buckets; /* Pointers to HashEntry, one * for each bucket in the table. */ - unsigned int bucketsSize; - unsigned int numEntries; /* Number of entries in the table. */ - unsigned int bucketsMask; /* Used to select the bucket for a hash. */ - unsigned int maxchain; /* max length of chain detected */ + unsigned int bucketsSize; + unsigned int numEntries; /* Number of entries in the table. */ + unsigned int bucketsMask; /* Used to select the bucket for a hash. */ + unsigned int maxchain; /* max length of chain detected */ } HashTable; /* State of an iteration over all entries in a table. */ typedef struct HashIter { - HashTable *table; /* Table being searched. */ - unsigned int nextBucket; /* Next bucket to check (after current). */ - HashEntry *entry; /* Next entry to check in current bucket. */ + HashTable *table; /* Table being searched. */ + unsigned int nextBucket; /* Next bucket to check (after current). */ + HashEntry *entry; /* Next entry to check in current bucket. */ } HashIter; +/* A set of strings. */ +typedef struct HashSet { + HashTable tbl; +} HashSet; + MAKE_INLINE void * HashEntry_Get(HashEntry *h) { - return h->value; + return h->value; } MAKE_INLINE void HashEntry_Set(HashEntry *h, void *datum) { - h->value = datum; + h->value = datum; } void HashTable_Init(HashTable *); void HashTable_Done(HashTable *); HashEntry *HashTable_FindEntry(HashTable *, const char *); void *HashTable_FindValue(HashTable *, const char *); unsigned int Hash_Hash(const char *); void *HashTable_FindValueHash(HashTable *, const char *, unsigned int); HashEntry *HashTable_CreateEntry(HashTable *, const char *, Boolean *); HashEntry *HashTable_Set(HashTable *, const char *, void *); void HashTable_DeleteEntry(HashTable *, HashEntry *); void HashTable_DebugStats(HashTable *, const char *); void HashIter_Init(HashIter *, HashTable *); HashEntry *HashIter_Next(HashIter *); +MAKE_INLINE void +HashSet_Init(HashSet *set) +{ + HashTable_Init(&set->tbl); +} + +MAKE_INLINE void +HashSet_Done(HashSet *set) +{ + HashTable_Done(&set->tbl); +} + +MAKE_INLINE Boolean +HashSet_Add(HashSet *set, const char *key) +{ + Boolean isNew; + + (void)HashTable_CreateEntry(&set->tbl, key, &isNew); + return isNew; +} + +MAKE_INLINE Boolean +HashSet_Contains(HashSet *set, const char *key) +{ + return HashTable_FindEntry(&set->tbl, key) != NULL; +} + +MAKE_INLINE void +HashIter_InitSet(HashIter *hi, HashSet *set) +{ + HashIter_Init(hi, &set->tbl); +} + #endif /* MAKE_HASH_H */ diff --git a/import.sh b/import.sh new file mode 100755 index 000000000000..d4554a078951 --- /dev/null +++ b/import.sh @@ -0,0 +1,87 @@ +#!/bin/sh + +# Import bmake + +ECHO= +GIT=${GIT:-git} + +# For consistency... +Error() { + echo ERROR: ${1+"$@"} >&2 + exit 1 +} + +Cd() { + [ $# -eq 1 ] || Error "Cd() takes a single parameter." + cd $1 || Error "cannot \"cd $1\" from $PWD" +} + +# Call this function and then follow it by any specific import script additions +option_parsing() { + local _shift=$# + # Parse command line options + while : + do + case "$1" in + *=*) eval "$1"; shift;; + --) shift; break;; + -a) TARBALL=$2; shift 2;; + -n) ECHO=echo; shift;; + -P) PR=$2; shift 2;; + -r) REVIEWER=$2; shift 2;; + -u) url=$2; shift 2;; + -h) echo "Usage:"; + echo " "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]' + echo " "$0 '-a # (a)rchive' + echo " "$0 '-h # print usage' + echo " "$0 '-n # do not import, check only.' + echo " "$0 '-P # Use PR' + echo " "$0 '-r # (r)eviewed by' + echo " "$0 'PR=' + echo " "$0 'REVIEWER=' + exit 1;; + *) break;; + esac + done + return $(($_shift - $#)) +} + +### + +option_parsing "$@" +shift $? + +TF=/tmp/.$USER.$$ +Cd `dirname $0` +test -s ${TARBALL:-/dev/null} || Error need TARBALL +here=`pwd` +# thing should match what the TARBALL contains +thing=`basename $here` + +case "$thing" in +bmake) (cd .. && tar zxf $TARBALL);; +*) Error "we should be in bmake";; +esac + +VERSION=`grep '^_MAKE_VERSION' VERSION | sed 's,.*=[[:space:]]*,,'` + +rm -f *~ +mkdir -p ../tmp + +if [ -z "$ECHO" ]; then + # new files are handled automatically + # but we need to rm if needed + $GIT diff FILES | sed -n '/^-[^-]/s,^-,,p' > $TF.rm + test -s $TF.rm && xargs rm -f < $TF.rm + $GIT add -A + $GIT diff --staged | tee ../tmp/bmake-import.diff + echo "$GIT tag -a vendor/NetBSD/bmake/$VERSION" > ../tmp/bmake-post.sh + echo "After you commit, run $here/../tmp/bmake-post.sh" +else + # FILES is kept sorted so we can determine what was added and deleted + $GIT diff FILES | sed -n '/^+[^+]/s,^+,,p' > $TF.add + $GIT diff FILES | sed -n '/^-[^-]/s,^-,,p' > $TF.rm + test -s $TF.rm && { echo Removing:; cat $TF.rm; } + test -s $TF.add && { echo Adding:; cat $TF.add; } + $GIT diff +fi diff --git a/job.c b/job.c index ff0f1bcb8f4c..2a43a64e9749 100644 --- a/job.c +++ b/job.c @@ -1,2824 +1,2988 @@ -/* $NetBSD: job.c,v 1.326 2020/11/16 18:28:27 rillig Exp $ */ +/* $NetBSD: job.c,v 1.397 2021/01/10 23:59:53 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /*- * job.c -- * handle the creation etc. of our child processes. * * Interface: * Job_Init Called to initialize this module. In addition, * any commands attached to the .BEGIN target * are executed before this function returns. * Hence, the makefiles must have been parsed * before this function is called. * * Job_End Clean up any memory used. * * Job_Make Start the creation of the given target. * * Job_CatchChildren * Check for and handle the termination of any * children. This must be called reasonably * frequently to keep the whole make going at * a decent clip, since job table entries aren't * removed until their process is caught this way. * * Job_CatchOutput * Print any output our children have produced. * Should also be called fairly frequently to * keep the user informed of what's going on. * If no output is waiting, it will block for * a time given by the SEL_* constants, below, * or until output is ready. * * Job_ParseShell Given the line following a .SHELL target, parse * the line as a shell specification. Returns * FALSE if the spec was incorrect. * * Job_Finish Perform any final processing which needs doing. * This includes the execution of any commands * which have been/were attached to the .END * target. It should only be called when the * job table is empty. * * Job_AbortAll Abort all currently running jobs. It doesn't * handle output or do anything for the jobs, * just kills them. It should only be called in * an emergency. * * Job_CheckCommands * Verify that the commands for a target are * ok. Provide them if necessary and possible. * * Job_Touch Update a target without really updating it. * * Job_Wait Wait for all currently-running jobs to finish. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif #include #include #include #include #include "wait.h" #include #if !defined(USE_SELECT) && defined(HAVE_POLL_H) #include #else #ifndef USE_SELECT /* no poll.h */ # define USE_SELECT #endif #if defined(HAVE_SYS_SELECT_H) # include #endif #endif #include #include #if defined(HAVE_SYS_SOCKET_H) # include #endif #include "make.h" #include "dir.h" #include "job.h" #include "pathnames.h" #include "trace.h" /* "@(#)job.c 8.2 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: job.c,v 1.326 2020/11/16 18:28:27 rillig Exp $"); +MAKE_RCSID("$NetBSD: job.c,v 1.397 2021/01/10 23:59:53 rillig Exp $"); -/* A shell defines how the commands are run. All commands for a target are +/* + * A shell defines how the commands are run. All commands for a target are * written into a single file, which is then given to the shell to execute * the commands from it. The commands are written to the file using a few * templates for echo control and error control. * * The name of the shell is the basename for the predefined shells, such as * "sh", "csh", "bash". For custom shells, it is the full pathname, and its * basename is used to select the type of shell; the longest match wins. * So /usr/pkg/bin/bash has type sh, /usr/local/bin/tcsh has type csh. * * The echoing of command lines is controlled using hasEchoCtl, echoOff, * echoOn, noPrint and noPrintLen. When echoOff is executed by the shell, it * still outputs something, but this something is not interesting, therefore * it is filtered out using noPrint and noPrintLen. * * The error checking for individual commands is controlled using hasErrCtl, - * errOnOrEcho, errOffOrExecIgnore and errExit. + * errOn, errOff and runChkTmpl. * - * If a shell doesn't have error control, errOnOrEcho becomes a printf template - * for echoing the command, should echoing be on; errOffOrExecIgnore becomes + * If a shell doesn't have error control, echoTmpl becomes a printf template + * for echoing the command, should echoing be on; runIgnTmpl becomes * another printf template for executing the command while ignoring the return - * status. Finally errExit is a printf template for running the command and + * status. Finally runChkTmpl is a printf template for running the command and * causing the shell to exit on error. If any of these strings are empty when * hasErrCtl is FALSE, the command will be executed anyway as is, and if it * causes an error, so be it. Any templates set up to echo the command will * escape any '$ ` \ "' characters in the command string to avoid common * problems with echo "%s\n" as a template. * * The command-line flags "echo" and "exit" also control the behavior. The * "echo" flag causes the shell to start echoing commands right away. The * "exit" flag causes the shell to exit when an error is detected in one of * the commands. */ typedef struct Shell { - /* The name of the shell. For Bourne and C shells, this is used only to - * find the shell description when used as the single source of a .SHELL - * target. For user-defined shells, this is the full path of the shell. */ - const char *name; + /* + * The name of the shell. For Bourne and C shells, this is used only + * to find the shell description when used as the single source of a + * .SHELL target. For user-defined shells, this is the full path of + * the shell. + */ + const char *name; - Boolean hasEchoCtl; /* True if both echoOff and echoOn defined */ - const char *echoOff; /* command to turn off echo */ - const char *echoOn; /* command to turn it back on again */ - const char *noPrint; /* text to skip when printing output from + Boolean hasEchoCtl; /* whether both echoOff and echoOn are there */ + const char *echoOff; /* command to turn echoing off */ + const char *echoOn; /* command to turn echoing back on */ + const char *noPrint; /* text to skip when printing output from the * shell. This is usually the same as echoOff */ - size_t noPrintLen; /* length of noPrint command */ + size_t noPrintLen; /* length of noPrint command */ + + Boolean hasErrCtl; /* whether error checking can be controlled + * for individual commands */ + const char *errOn; /* command to turn on error checking */ + const char *errOff; /* command to turn off error checking */ + + const char *echoTmpl; /* template to echo a command */ + const char *runIgnTmpl; /* template to run a command + * without error checking */ + const char *runChkTmpl; /* template to run a command + * with error checking */ + + /* string literal that results in a newline character when it appears + * outside of any 'quote' or "quote" characters */ + const char *newline; + char commentChar; /* character used by shell for comment lines */ + + const char *echoFlag; /* shell flag to echo commands */ + const char *errFlag; /* shell flag to exit on error */ +} Shell; - Boolean hasErrCtl; /* set if can control error checking for - * individual commands */ - /* XXX: split into errOn and echoCmd */ - const char *errOnOrEcho; /* template to turn on error checking */ - /* XXX: split into errOff and execIgnore */ - const char *errOffOrExecIgnore; /* template to turn off error checking */ - const char *errExit; /* template to use for testing exit code */ +typedef struct CommandFlags { + /* Whether to echo the command before running it. */ + Boolean echo; - /* string literal that results in a newline character when it appears - * outside of any 'quote' or "quote" characters */ - const char *newline; - char commentChar; /* character used by shell for comment lines */ + /* Run the command even in -n or -N mode. */ + Boolean always; - /* - * command-line flags - */ - const char *echo; /* echo commands */ - const char *exit; /* exit on error */ -} Shell; + /* + * true if we turned error checking off before printing the command + * and need to turn it back on + */ + Boolean ignerr; +} CommandFlags; + +/* + * Write shell commands to a file. + * + * TODO: keep track of whether commands are echoed. + * TODO: keep track of whether error checking is active. + */ +typedef struct ShellWriter { + FILE *f; + + /* we've sent 'set -x' */ + Boolean xtraced; + +} ShellWriter; /* * error handling variables */ -static int errors = 0; /* number of errors reported */ +static int job_errors = 0; /* number of errors reported */ typedef enum AbortReason { /* why is the make aborting? */ - ABORT_NONE, - ABORT_ERROR, /* Because of an error */ - ABORT_INTERRUPT, /* Because it was interrupted */ - ABORT_WAIT /* Waiting for jobs to finish */ + ABORT_NONE, + ABORT_ERROR, /* Because of an error */ + ABORT_INTERRUPT, /* Because it was interrupted */ + ABORT_WAIT /* Waiting for jobs to finish */ } AbortReason; static AbortReason aborting = ABORT_NONE; -#define JOB_TOKENS "+EI+" /* Token to requeue for each abort state */ +#define JOB_TOKENS "+EI+" /* Token to requeue for each abort state */ /* * this tracks the number of tokens currently "out" to build jobs. */ int jobTokensRunning = 0; -/* The number of commands actually printed to the shell commands file for - * the current job. Should this number be 0, no shell will be executed. */ -static int numCommands; - typedef enum JobStartResult { - JOB_RUNNING, /* Job is running */ - JOB_ERROR, /* Error in starting the job */ - JOB_FINISHED /* The job is already finished */ + JOB_RUNNING, /* Job is running */ + JOB_ERROR, /* Error in starting the job */ + JOB_FINISHED /* The job is already finished */ } JobStartResult; /* * Descriptions for various shells. * * The build environment may set DEFSHELL_INDEX to one of * DEFSHELL_INDEX_SH, DEFSHELL_INDEX_KSH, or DEFSHELL_INDEX_CSH, to * select one of the predefined shells as the default shell. * * Alternatively, the build environment may set DEFSHELL_CUSTOM to the * name or the full path of a sh-compatible shell, which will be used as * the default shell. * * ".SHELL" lines in Makefiles can choose the default shell from the * set defined here, or add additional shells. */ #ifdef DEFSHELL_CUSTOM #define DEFSHELL_INDEX_CUSTOM 0 #define DEFSHELL_INDEX_SH 1 #define DEFSHELL_INDEX_KSH 2 #define DEFSHELL_INDEX_CSH 3 #else /* !DEFSHELL_CUSTOM */ #define DEFSHELL_INDEX_SH 0 #define DEFSHELL_INDEX_KSH 1 #define DEFSHELL_INDEX_CSH 2 #endif /* !DEFSHELL_CUSTOM */ #ifndef DEFSHELL_INDEX #define DEFSHELL_INDEX 0 /* DEFSHELL_INDEX_CUSTOM or DEFSHELL_INDEX_SH */ #endif /* !DEFSHELL_INDEX */ -static Shell shells[] = { +static Shell shells[] = { #ifdef DEFSHELL_CUSTOM /* * An sh-compatible shell with a non-standard name. * * Keep this in sync with the "sh" description below, but avoid * non-portable features that might not be supplied by all * sh-compatible shells. */ -{ - DEFSHELL_CUSTOM, /* .name */ - FALSE, /* .hasEchoCtl */ - "", /* .echoOff */ - "", /* .echoOn */ - "", /* .noPrint */ - 0, /* .noPrintLen */ - FALSE, /* .hasErrCtl */ - "echo \"%s\"\n", /* .errOnOrEcho */ - "%s\n", /* .errOffOrExecIgnore */ - "{ %s \n} || exit $?\n", /* .errExit */ - "'\n'", /* .newline */ - '#', /* .commentChar */ - "", /* .echo */ - "", /* .exit */ -}, + { + DEFSHELL_CUSTOM, /* .name */ + FALSE, /* .hasEchoCtl */ + "", /* .echoOff */ + "", /* .echoOn */ + "", /* .noPrint */ + 0, /* .noPrintLen */ + FALSE, /* .hasErrCtl */ + "", /* .errOn */ + "", /* .errOff */ + "echo \"%s\"\n", /* .echoTmpl */ + "%s\n", /* .runIgnTmpl */ + "{ %s \n} || exit $?\n", /* .runChkTmpl */ + "'\n'", /* .newline */ + '#', /* .commentChar */ + "", /* .echoFlag */ + "", /* .errFlag */ + }, #endif /* DEFSHELL_CUSTOM */ /* * SH description. Echo control is also possible and, under * sun UNIX anyway, one can even control error checking. */ -{ - "sh", /* .name */ - FALSE, /* .hasEchoCtl */ - "", /* .echoOff */ - "", /* .echoOn */ - "", /* .noPrint */ - 0, /* .noPrintLen */ - FALSE, /* .hasErrCtl */ - "echo \"%s\"\n", /* .errOnOrEcho */ - "%s\n", /* .errOffOrExecIgnore */ - "{ %s \n} || exit $?\n", /* .errExit */ - "'\n'", /* .newline */ - '#', /* .commentChar*/ + { + "sh", /* .name */ + FALSE, /* .hasEchoCtl */ + "", /* .echoOff */ + "", /* .echoOn */ + "", /* .noPrint */ + 0, /* .noPrintLen */ + FALSE, /* .hasErrCtl */ + "", /* .errOn */ + "", /* .errOff */ + "echo \"%s\"\n", /* .echoTmpl */ + "%s\n", /* .runIgnTmpl */ + "{ %s \n} || exit $?\n", /* .runChkTmpl */ + "'\n'", /* .newline */ + '#', /* .commentChar*/ #if defined(MAKE_NATIVE) && defined(__NetBSD__) - "q", /* .echo */ + /* XXX: -q is not really echoFlag, it's more like noEchoInSysFlag. */ + "q", /* .echoFlag */ #else - "", /* .echo */ + "", /* .echoFlag */ #endif - "", /* .exit */ -}, + "", /* .errFlag */ + }, /* * KSH description. */ -{ - "ksh", /* .name */ - TRUE, /* .hasEchoCtl */ - "set +v", /* .echoOff */ - "set -v", /* .echoOn */ - "set +v", /* .noPrint */ - 6, /* .noPrintLen */ - FALSE, /* .hasErrCtl */ - "echo \"%s\"\n", /* .errOnOrEcho */ - "%s\n", /* .errOffOrExecIgnore */ - "{ %s \n} || exit $?\n", /* .errExit */ - "'\n'", /* .newline */ - '#', /* .commentChar */ - "v", /* .echo */ - "", /* .exit */ -}, + { + "ksh", /* .name */ + TRUE, /* .hasEchoCtl */ + "set +v", /* .echoOff */ + "set -v", /* .echoOn */ + "set +v", /* .noPrint */ + 6, /* .noPrintLen */ + FALSE, /* .hasErrCtl */ + "", /* .errOn */ + "", /* .errOff */ + "echo \"%s\"\n", /* .echoTmpl */ + "%s\n", /* .runIgnTmpl */ + "{ %s \n} || exit $?\n", /* .runChkTmpl */ + "'\n'", /* .newline */ + '#', /* .commentChar */ + "v", /* .echoFlag */ + "", /* .errFlag */ + }, /* * CSH description. The csh can do echo control by playing * with the setting of the 'echo' shell variable. Sadly, * however, it is unable to do error control nicely. */ -{ - "csh", /* .name */ - TRUE, /* .hasEchoCtl */ - "unset verbose", /* .echoOff */ - "set verbose", /* .echoOn */ - "unset verbose", /* .noPrint */ - 13, /* .noPrintLen */ - FALSE, /* .hasErrCtl */ - "echo \"%s\"\n", /* .errOnOrEcho */ - /* XXX: Mismatch between errOn and execIgnore */ - "csh -c \"%s || exit 0\"\n", /* .errOffOrExecIgnore */ - "", /* .errExit */ - "'\\\n'", /* .newline */ - '#', /* .commentChar */ - "v", /* .echo */ - "e", /* .exit */ -} + { + "csh", /* .name */ + TRUE, /* .hasEchoCtl */ + "unset verbose", /* .echoOff */ + "set verbose", /* .echoOn */ + "unset verbose", /* .noPrint */ + 13, /* .noPrintLen */ + FALSE, /* .hasErrCtl */ + "", /* .errOn */ + "", /* .errOff */ + "echo \"%s\"\n", /* .echoTmpl */ + "csh -c \"%s || exit 0\"\n", /* .runIgnTmpl */ + "", /* .runChkTmpl */ + "'\\\n'", /* .newline */ + '#', /* .commentChar */ + "v", /* .echoFlag */ + "e", /* .errFlag */ + } }; -/* This is the shell to which we pass all commands in the Makefile. - * It is set by the Job_ParseShell function. */ -static Shell *commandShell = &shells[DEFSHELL_INDEX]; +/* + * This is the shell to which we pass all commands in the Makefile. + * It is set by the Job_ParseShell function. + */ +static Shell *shell = &shells[DEFSHELL_INDEX]; const char *shellPath = NULL; /* full pathname of executable image */ const char *shellName = NULL; /* last component of shellPath */ char *shellErrFlag = NULL; static char *shellArgv = NULL; /* Custom shell args */ static Job *job_table; /* The structures that describe them */ static Job *job_table_end; /* job_table + maxJobs */ static unsigned int wantToken; /* we want a token */ static Boolean lurking_children = FALSE; -static Boolean make_suspended = FALSE; /* Whether we've seen a SIGTSTP (etc) */ +static Boolean make_suspended = FALSE; /* Whether we've seen a SIGTSTP (etc) */ /* * Set of descriptors of pipes connected to * the output channels of children */ static struct pollfd *fds = NULL; -static Job **jobfds = NULL; -static nfds_t nfds = 0; +static Job **allJobs = NULL; +static nfds_t nJobs = 0; static void watchfd(Job *); static void clearfd(Job *); -static int readyfd(Job *); +static Boolean readyfd(Job *); -static GNode *lastNode; /* The node for which output was most recently - * produced. */ -static char *targPrefix = NULL; /* What we print at the start of TARG_FMT */ +static char *targPrefix = NULL; /* To identify a job change in the output. */ static Job tokenWaitJob; /* token wait pseudo-job */ static Job childExitJob; /* child exit pseudo-job */ -#define CHILD_EXIT "." -#define DO_JOB_RESUME "R" +#define CHILD_EXIT "." +#define DO_JOB_RESUME "R" -enum { npseudojobs = 2 }; /* number of pseudo-jobs */ - -#define TARG_FMT "%s %s ---\n" /* Default format */ -#define MESSAGE(fp, gn) \ - if (opts.maxJobs != 1 && targPrefix && *targPrefix) \ - (void)fprintf(fp, TARG_FMT, targPrefix, gn->name) +enum { + npseudojobs = 2 /* number of pseudo-jobs */ +}; static sigset_t caught_signals; /* Set of signals we handle */ static void JobDoOutput(Job *, Boolean); -static void JobInterrupt(int, int) MAKE_ATTR_DEAD; +static void JobInterrupt(Boolean, int) MAKE_ATTR_DEAD; static void JobRestartJobs(void); static void JobSigReset(void); +static void +SwitchOutputTo(GNode *gn) +{ + /* The node for which output was most recently produced. */ + static GNode *lastNode = NULL; + + if (gn == lastNode) + return; + lastNode = gn; + + if (opts.maxJobs != 1 && targPrefix != NULL && targPrefix[0] != '\0') + (void)fprintf(stdout, "%s %s ---\n", targPrefix, gn->name); +} + static unsigned nfds_per_job(void) { #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) - if (useMeta) - return 2; + if (useMeta) + return 2; #endif - return 1; + return 1; +} + +void +Job_FlagsToString(const Job *job, char *buf, size_t bufsize) +{ + snprintf(buf, bufsize, "%c%c%c", + job->ignerr ? 'i' : '-', + !job->echo ? 's' : '-', + job->special ? 'S' : '-'); } static void job_table_dump(const char *where) { - Job *job; + Job *job; + char flags[4]; - debug_printf("job table @ %s\n", where); - for (job = job_table; job < job_table_end; job++) { - debug_printf("job %d, status %d, flags %d, pid %d\n", - (int)(job - job_table), job->status, job->flags, job->pid); - } + debug_printf("job table @ %s\n", where); + for (job = job_table; job < job_table_end; job++) { + Job_FlagsToString(job, flags, sizeof flags); + debug_printf("job %d, status %d, flags %s, pid %d\n", + (int)(job - job_table), job->status, flags, job->pid); + } } /* * Delete the target of a failed, interrupted, or otherwise * unsuccessful job unless inhibited by .PRECIOUS. */ static void JobDeleteTarget(GNode *gn) { - const char *file; - - if (gn->type & OP_JOIN) - return; - if (gn->type & OP_PHONY) - return; - if (Targ_Precious(gn)) - return; - if (opts.noExecute) - return; - - file = GNode_Path(gn); - if (eunlink(file) != -1) - Error("*** %s removed", file); + const char *file; + + if (gn->type & OP_JOIN) + return; + if (gn->type & OP_PHONY) + return; + if (Targ_Precious(gn)) + return; + if (opts.noExecute) + return; + + file = GNode_Path(gn); + if (eunlink(file) != -1) + Error("*** %s removed", file); } /* * JobSigLock/JobSigUnlock * * Signal lock routines to get exclusive access. Currently used to * protect `jobs' and `stoppedJobs' list manipulations. */ -static void JobSigLock(sigset_t *omaskp) +static void +JobSigLock(sigset_t *omaskp) { if (sigprocmask(SIG_BLOCK, &caught_signals, omaskp) != 0) { Punt("JobSigLock: sigprocmask: %s", strerror(errno)); sigemptyset(omaskp); } } -static void JobSigUnlock(sigset_t *omaskp) +static void +JobSigUnlock(sigset_t *omaskp) { (void)sigprocmask(SIG_SETMASK, omaskp, NULL); } static void JobCreatePipe(Job *job, int minfd) { - int i, fd, flags; - int pipe_fds[2]; - - if (pipe(pipe_fds) == -1) - Punt("Cannot create pipe: %s", strerror(errno)); - - for (i = 0; i < 2; i++) { - /* Avoid using low numbered fds */ - fd = fcntl(pipe_fds[i], F_DUPFD, minfd); - if (fd != -1) { - close(pipe_fds[i]); - pipe_fds[i] = fd; + int i, fd, flags; + int pipe_fds[2]; + + if (pipe(pipe_fds) == -1) + Punt("Cannot create pipe: %s", strerror(errno)); + + for (i = 0; i < 2; i++) { + /* Avoid using low numbered fds */ + fd = fcntl(pipe_fds[i], F_DUPFD, minfd); + if (fd != -1) { + close(pipe_fds[i]); + pipe_fds[i] = fd; + } } - } - job->inPipe = pipe_fds[0]; - job->outPipe = pipe_fds[1]; + job->inPipe = pipe_fds[0]; + job->outPipe = pipe_fds[1]; - /* Set close-on-exec flag for both */ - if (fcntl(job->inPipe, F_SETFD, FD_CLOEXEC) == -1) - Punt("Cannot set close-on-exec: %s", strerror(errno)); - if (fcntl(job->outPipe, F_SETFD, FD_CLOEXEC) == -1) - Punt("Cannot set close-on-exec: %s", strerror(errno)); + /* Set close-on-exec flag for both */ + if (fcntl(job->inPipe, F_SETFD, FD_CLOEXEC) == -1) + Punt("Cannot set close-on-exec: %s", strerror(errno)); + if (fcntl(job->outPipe, F_SETFD, FD_CLOEXEC) == -1) + Punt("Cannot set close-on-exec: %s", strerror(errno)); - /* - * We mark the input side of the pipe non-blocking; we poll(2) the - * pipe when we're waiting for a job token, but we might lose the - * race for the token when a new one becomes available, so the read - * from the pipe should not block. - */ - flags = fcntl(job->inPipe, F_GETFL, 0); - if (flags == -1) - Punt("Cannot get flags: %s", strerror(errno)); - flags |= O_NONBLOCK; - if (fcntl(job->inPipe, F_SETFL, flags) == -1) - Punt("Cannot set flags: %s", strerror(errno)); + /* + * We mark the input side of the pipe non-blocking; we poll(2) the + * pipe when we're waiting for a job token, but we might lose the + * race for the token when a new one becomes available, so the read + * from the pipe should not block. + */ + flags = fcntl(job->inPipe, F_GETFL, 0); + if (flags == -1) + Punt("Cannot get flags: %s", strerror(errno)); + flags |= O_NONBLOCK; + if (fcntl(job->inPipe, F_SETFL, flags) == -1) + Punt("Cannot set flags: %s", strerror(errno)); } /* Pass the signal to each running job. */ static void JobCondPassSig(int signo) { - Job *job; + Job *job; - DEBUG1(JOB, "JobCondPassSig(%d) called.\n", signo); + DEBUG1(JOB, "JobCondPassSig(%d) called.\n", signo); - for (job = job_table; job < job_table_end; job++) { - if (job->status != JOB_ST_RUNNING) - continue; - DEBUG2(JOB, "JobCondPassSig passing signal %d to child %d.\n", - signo, job->pid); - KILLPG(job->pid, signo); - } + for (job = job_table; job < job_table_end; job++) { + if (job->status != JOB_ST_RUNNING) + continue; + DEBUG2(JOB, "JobCondPassSig passing signal %d to child %d.\n", + signo, job->pid); + KILLPG(job->pid, signo); + } } -/* SIGCHLD handler. +/* + * SIGCHLD handler. * - * Sends a token on the child exit pipe to wake us up from select()/poll(). */ + * Sends a token on the child exit pipe to wake us up from select()/poll(). + */ +/*ARGSUSED*/ static void JobChildSig(int signo MAKE_ATTR_UNUSED) { - while (write(childExitJob.outPipe, CHILD_EXIT, 1) == -1 && errno == EAGAIN) - continue; + while (write(childExitJob.outPipe, CHILD_EXIT, 1) == -1 && + errno == EAGAIN) + continue; } /* Resume all stopped jobs. */ +/*ARGSUSED*/ static void JobContinueSig(int signo MAKE_ATTR_UNUSED) { - /* - * Defer sending SIGCONT to our stopped children until we return - * from the signal handler. - */ - while (write(childExitJob.outPipe, DO_JOB_RESUME, 1) == -1 && - errno == EAGAIN) - continue; + /* + * Defer sending SIGCONT to our stopped children until we return + * from the signal handler. + */ + while (write(childExitJob.outPipe, DO_JOB_RESUME, 1) == -1 && + errno == EAGAIN) + continue; } -/* Pass a signal on to all jobs, then resend to ourselves. - * We die by the same signal. */ +/* + * Pass a signal on to all jobs, then resend to ourselves. + * We die by the same signal. + */ MAKE_ATTR_DEAD static void JobPassSig_int(int signo) { - /* Run .INTERRUPT target then exit */ - JobInterrupt(TRUE, signo); + /* Run .INTERRUPT target then exit */ + JobInterrupt(TRUE, signo); } -/* Pass a signal on to all jobs, then resend to ourselves. - * We die by the same signal. */ +/* + * Pass a signal on to all jobs, then resend to ourselves. + * We die by the same signal. + */ MAKE_ATTR_DEAD static void JobPassSig_term(int signo) { - /* Dont run .INTERRUPT target then exit */ - JobInterrupt(FALSE, signo); + /* Dont run .INTERRUPT target then exit */ + JobInterrupt(FALSE, signo); } static void JobPassSig_suspend(int signo) { - sigset_t nmask, omask; - struct sigaction act; + sigset_t nmask, omask; + struct sigaction act; - /* Suppress job started/continued messages */ - make_suspended = TRUE; + /* Suppress job started/continued messages */ + make_suspended = TRUE; - /* Pass the signal onto every job */ - JobCondPassSig(signo); + /* Pass the signal onto every job */ + JobCondPassSig(signo); - /* - * Send ourselves the signal now we've given the message to everyone else. - * Note we block everything else possible while we're getting the signal. - * This ensures that all our jobs get continued when we wake up before - * we take any other signal. - */ - sigfillset(&nmask); - sigdelset(&nmask, signo); - (void)sigprocmask(SIG_SETMASK, &nmask, &omask); + /* + * Send ourselves the signal now we've given the message to everyone + * else. Note we block everything else possible while we're getting + * the signal. This ensures that all our jobs get continued when we + * wake up before we take any other signal. + */ + sigfillset(&nmask); + sigdelset(&nmask, signo); + (void)sigprocmask(SIG_SETMASK, &nmask, &omask); - act.sa_handler = SIG_DFL; - sigemptyset(&act.sa_mask); - act.sa_flags = 0; - (void)sigaction(signo, &act, NULL); + act.sa_handler = SIG_DFL; + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + (void)sigaction(signo, &act, NULL); - if (DEBUG(JOB)) - debug_printf("JobPassSig passing signal %d to self.\n", signo); + DEBUG1(JOB, "JobPassSig passing signal %d to self.\n", signo); - (void)kill(getpid(), signo); + (void)kill(getpid(), signo); - /* - * We've been continued. - * - * A whole host of signals continue to happen! - * SIGCHLD for any processes that actually suspended themselves. - * SIGCHLD for any processes that exited while we were alseep. - * The SIGCONT that actually caused us to wakeup. - * - * Since we defer passing the SIGCONT on to our children until - * the main processing loop, we can be sure that all the SIGCHLD - * events will have happened by then - and that the waitpid() will - * collect the child 'suspended' events. - * For correct sequencing we just need to ensure we process the - * waitpid() before passing on the SIGCONT. - * - * In any case nothing else is needed here. - */ + /* + * We've been continued. + * + * A whole host of signals continue to happen! + * SIGCHLD for any processes that actually suspended themselves. + * SIGCHLD for any processes that exited while we were alseep. + * The SIGCONT that actually caused us to wakeup. + * + * Since we defer passing the SIGCONT on to our children until + * the main processing loop, we can be sure that all the SIGCHLD + * events will have happened by then - and that the waitpid() will + * collect the child 'suspended' events. + * For correct sequencing we just need to ensure we process the + * waitpid() before passing on the SIGCONT. + * + * In any case nothing else is needed here. + */ - /* Restore handler and signal mask */ - act.sa_handler = JobPassSig_suspend; - (void)sigaction(signo, &act, NULL); - (void)sigprocmask(SIG_SETMASK, &omask, NULL); + /* Restore handler and signal mask */ + act.sa_handler = JobPassSig_suspend; + (void)sigaction(signo, &act, NULL); + (void)sigprocmask(SIG_SETMASK, &omask, NULL); } static Job * JobFindPid(int pid, JobStatus status, Boolean isJobs) { - Job *job; + Job *job; - for (job = job_table; job < job_table_end; job++) { - if (job->status == status && job->pid == pid) - return job; - } - if (DEBUG(JOB) && isJobs) - job_table_dump("no pid"); - return NULL; + for (job = job_table; job < job_table_end; job++) { + if (job->status == status && job->pid == pid) + return job; + } + if (DEBUG(JOB) && isJobs) + job_table_dump("no pid"); + return NULL; } /* Parse leading '@', '-' and '+', which control the exact execution mode. */ static void -ParseRunOptions( - char **pp, - Boolean *out_shutUp, Boolean *out_errOff, Boolean *out_runAlways) -{ - char *p = *pp; - *out_shutUp = FALSE; - *out_errOff = FALSE; - *out_runAlways = FALSE; - - for (;;) { - if (*p == '@') - *out_shutUp = !DEBUG(LOUD); - else if (*p == '-') - *out_errOff = TRUE; - else if (*p == '+') - *out_runAlways = TRUE; - else - break; - p++; - } +ParseCommandFlags(char **pp, CommandFlags *out_cmdFlags) +{ + char *p = *pp; + out_cmdFlags->echo = TRUE; + out_cmdFlags->ignerr = FALSE; + out_cmdFlags->always = FALSE; + + for (;;) { + if (*p == '@') + out_cmdFlags->echo = DEBUG(LOUD); + else if (*p == '-') + out_cmdFlags->ignerr = TRUE; + else if (*p == '+') + out_cmdFlags->always = TRUE; + else + break; + p++; + } - pp_skip_whitespace(&p); + pp_skip_whitespace(&p); - *pp = p; + *pp = p; } /* Escape a string for a double-quoted string literal in sh, csh and ksh. */ static char * EscapeShellDblQuot(const char *cmd) { - size_t i, j; + size_t i, j; + + /* Worst that could happen is every char needs escaping. */ + char *esc = bmake_malloc(strlen(cmd) * 2 + 1); + for (i = 0, j = 0; cmd[i] != '\0'; i++, j++) { + if (cmd[i] == '$' || cmd[i] == '`' || cmd[i] == '\\' || + cmd[i] == '"') + esc[j++] = '\\'; + esc[j] = cmd[i]; + } + esc[j] = '\0'; - /* Worst that could happen is every char needs escaping. */ - char *esc = bmake_malloc(strlen(cmd) * 2 + 1); - for (i = 0, j = 0; cmd[i] != '\0'; i++, j++) { - if (cmd[i] == '$' || cmd[i] == '`' || cmd[i] == '\\' || cmd[i] == '"') - esc[j++] = '\\'; - esc[j] = cmd[i]; - } - esc[j] = '\0'; + return esc; +} + +static void +ShellWriter_PrintFmt(ShellWriter *wr, const char *fmt, const char *arg) +{ + DEBUG1(JOB, fmt, arg); - return esc; + (void)fprintf(wr->f, fmt, arg); + /* XXX: Is flushing needed in any case, or only if f == stdout? */ + (void)fflush(wr->f); } static void -JobPrintf(Job *job, const char *fmt, const char *arg) +ShellWriter_Println(ShellWriter *wr, const char *line) { - if (DEBUG(JOB)) - debug_printf(fmt, arg); + ShellWriter_PrintFmt(wr, "%s\n", line); +} - (void)fprintf(job->cmdFILE, fmt, arg); - (void)fflush(job->cmdFILE); +static void +ShellWriter_EchoOff(ShellWriter *wr) +{ + if (shell->hasEchoCtl) + ShellWriter_Println(wr, shell->echoOff); } static void -JobPrintln(Job *job, const char *line) +ShellWriter_EchoCmd(ShellWriter *wr, const char *escCmd) { - JobPrintf(job, "%s\n", line); + ShellWriter_PrintFmt(wr, shell->echoTmpl, escCmd); } -/*- - *----------------------------------------------------------------------- - * JobPrintCommand -- - * Put out another command for the given job. If the command starts - * with an @ or a - we process it specially. In the former case, - * so long as the -s and -n flags weren't given to make, we stick - * a shell-specific echoOff command in the script. In the latter, - * we ignore errors for the entire job, unless the shell has error - * control. - * If the command is just "..." we take all future commands for this - * job to be commands to be executed once the entire graph has been - * made and return non-zero to signal that the end of the commands - * was reached. These commands are later attached to the .END - * node and executed by Job_End when all things are done. - * - * Side Effects: - * If the command begins with a '-' and the shell has no error control, - * the JOB_IGNERR flag is set in the job descriptor. - * numCommands is incremented if the command is actually printed. - *----------------------------------------------------------------------- - */ static void -JobPrintCommand(Job *job, char *cmd) +ShellWriter_EchoOn(ShellWriter *wr) { - const char *const cmdp = cmd; - Boolean noSpecials; /* true if we shouldn't worry about - * inserting special commands into - * the input stream. */ - Boolean shutUp; /* true if we put a no echo command - * into the command file */ - Boolean errOff; /* true if we turned error checking - * off before printing the command - * and need to turn it back on */ - Boolean runAlways; - const char *cmdTemplate; /* Template to use when printing the - * command */ - char *cmdStart; /* Start of expanded command */ - char *escCmd = NULL; /* Command with quotes/backticks escaped */ + if (shell->hasEchoCtl) + ShellWriter_Println(wr, shell->echoOn); +} + +static void +ShellWriter_TraceOn(ShellWriter *wr) +{ + if (!wr->xtraced) { + ShellWriter_Println(wr, "set -x"); + wr->xtraced = TRUE; + } +} - noSpecials = !GNode_ShouldExecute(job->node); +static void +ShellWriter_ErrOff(ShellWriter *wr, Boolean echo) +{ + if (echo) + ShellWriter_EchoOff(wr); + ShellWriter_Println(wr, shell->errOff); + if (echo) + ShellWriter_EchoOn(wr); +} - numCommands++; +static void +ShellWriter_ErrOn(ShellWriter *wr, Boolean echo) +{ + if (echo) + ShellWriter_EchoOff(wr); + ShellWriter_Println(wr, shell->errOn); + if (echo) + ShellWriter_EchoOn(wr); +} - Var_Subst(cmd, job->node, VARE_WANTRES, &cmd); - /* TODO: handle errors */ - cmdStart = cmd; +/* + * The shell has no built-in error control, so emulate error control by + * enclosing each shell command in a template like "{ %s \n } || exit $?" + * (configurable per shell). + */ +static void +JobPrintSpecialsEchoCtl(Job *job, ShellWriter *wr, CommandFlags *inout_cmdFlags, + const char *escCmd, const char **inout_cmdTemplate) +{ + /* XXX: Why is the job modified at this point? */ + job->ignerr = TRUE; - cmdTemplate = "%s\n"; + if (job->echo && inout_cmdFlags->echo) { + ShellWriter_EchoOff(wr); + ShellWriter_EchoCmd(wr, escCmd); - ParseRunOptions(&cmd, &shutUp, &errOff, &runAlways); + /* + * Leave echoing off so the user doesn't see the commands + * for toggling the error checking. + */ + inout_cmdFlags->echo = FALSE; + } else { + if (inout_cmdFlags->echo) + ShellWriter_EchoCmd(wr, escCmd); + } + *inout_cmdTemplate = shell->runIgnTmpl; - if (runAlways && noSpecials) { /* - * We're not actually executing anything... - * but this one needs to be - use compat mode just for it. + * The template runIgnTmpl already takes care of ignoring errors, + * so pretend error checking is still on. + * XXX: What effects does this have, and why is it necessary? */ - Compat_RunCommand(cmdp, job->node); - free(cmdStart); - return; - } + inout_cmdFlags->ignerr = FALSE; +} - /* - * If the shell doesn't have error control the alternate echo'ing will - * be done (to avoid showing additional error checking code) - * and this will need the characters '$ ` \ "' escaped - */ +static void +JobPrintSpecials(Job *job, ShellWriter *wr, const char *escCmd, Boolean run, + CommandFlags *inout_cmdFlags, const char **inout_cmdTemplate) +{ + if (!run) { + /* + * If there is no command to run, there is no need to switch + * error checking off and on again for nothing. + */ + inout_cmdFlags->ignerr = FALSE; + } else if (shell->hasErrCtl) + ShellWriter_ErrOff(wr, job->echo && inout_cmdFlags->echo); + else if (shell->runIgnTmpl != NULL && shell->runIgnTmpl[0] != '\0') { + JobPrintSpecialsEchoCtl(job, wr, inout_cmdFlags, escCmd, + inout_cmdTemplate); + } else + inout_cmdFlags->ignerr = FALSE; +} - if (!commandShell->hasErrCtl) - escCmd = EscapeShellDblQuot(cmd); +/* + * Put out another command for the given job. + * + * If the command starts with '@' and neither the -s nor the -n flag was + * given to make, we stick a shell-specific echoOff command in the script. + * + * If the command starts with '-' and the shell has no error control (none + * of the predefined shells has that), we ignore errors for the entire job. + * XXX: Why ignore errors for the entire job? + * XXX: Even ignore errors for the commands before this command? + * + * If the command is just "...", all further commands of this job are skipped + * for now. They are attached to the .END node and will be run by Job_Finish + * after all other targets have been made. + */ +static void +JobPrintCommand(Job *job, ShellWriter *wr, StringListNode *ln, const char *ucmd) +{ + Boolean run; - if (shutUp) { - if (!(job->flags & JOB_SILENT) && !noSpecials && - (commandShell->hasEchoCtl)) { - JobPrintln(job, commandShell->echoOff); - } else { - if (commandShell->hasErrCtl) - shutUp = FALSE; - } - } + CommandFlags cmdFlags; + /* Template for printing a command to the shell file */ + const char *cmdTemplate; + char *xcmd; /* The expanded command */ + char *xcmdStart; + char *escCmd; /* xcmd escaped to be used in double quotes */ - if (errOff) { - if (!noSpecials) { - if (commandShell->hasErrCtl) { + run = GNode_ShouldExecute(job->node); + + Var_Subst(ucmd, job->node, VARE_WANTRES, &xcmd); + /* TODO: handle errors */ + xcmdStart = xcmd; + + cmdTemplate = "%s\n"; + + ParseCommandFlags(&xcmd, &cmdFlags); + + /* The '+' command flag overrides the -n or -N options. */ + if (cmdFlags.always && !run) { /* - * we don't want the error-control commands showing - * up either, so we turn off echoing while executing - * them. We could put another field in the shell - * structure to tell JobDoOutput to look for this - * string too, but why make it any more complex than - * it already is? + * We're not actually executing anything... + * but this one needs to be - use compat mode just for it. */ - if (!(job->flags & JOB_SILENT) && !shutUp && - (commandShell->hasEchoCtl)) { - JobPrintln(job, commandShell->echoOff); - JobPrintln(job, commandShell->errOffOrExecIgnore); - JobPrintln(job, commandShell->echoOn); + Compat_RunCommand(ucmd, job->node, ln); + free(xcmdStart); + return; + } + + /* + * If the shell doesn't have error control, the alternate echoing + * will be done (to avoid showing additional error checking code) + * and this needs some characters escaped. + */ + escCmd = shell->hasErrCtl ? NULL : EscapeShellDblQuot(xcmd); + + if (!cmdFlags.echo) { + if (job->echo && run && shell->hasEchoCtl) { + ShellWriter_EchoOff(wr); } else { - JobPrintln(job, commandShell->errOffOrExecIgnore); + if (shell->hasErrCtl) + cmdFlags.echo = TRUE; } - } else if (commandShell->errOffOrExecIgnore && - commandShell->errOffOrExecIgnore[0] != '\0') { + } + + if (cmdFlags.ignerr) { + JobPrintSpecials(job, wr, escCmd, run, &cmdFlags, &cmdTemplate); + } else { + /* - * The shell has no error control, so we need to be - * weird to get it to ignore any errors from the command. - * If echoing is turned on, we turn it off and use the - * errOnOrEcho template to echo the command. Leave echoing - * off so the user doesn't see the weirdness we go through - * to ignore errors. Set cmdTemplate to use the weirdness - * instead of the simple "%s\n" template. + * If errors are being checked and the shell doesn't have + * error control but does supply an runChkTmpl template, then + * set up commands to run through it. */ - job->flags |= JOB_IGNERR; - if (!(job->flags & JOB_SILENT) && !shutUp) { - if (commandShell->hasEchoCtl) { - JobPrintln(job, commandShell->echoOff); - } - JobPrintf(job, commandShell->errOnOrEcho, escCmd); - shutUp = TRUE; - } else { - if (!shutUp) - JobPrintf(job, commandShell->errOnOrEcho, escCmd); + + if (!shell->hasErrCtl && shell->runChkTmpl != NULL && + shell->runChkTmpl[0] != '\0') { + if (job->echo && cmdFlags.echo) { + ShellWriter_EchoOff(wr); + ShellWriter_EchoCmd(wr, escCmd); + cmdFlags.echo = FALSE; + } + /* + * If it's a comment line or blank, avoid the possible + * syntax error generated by "{\n} || exit $?". + */ + cmdTemplate = escCmd[0] == shell->commentChar || + escCmd[0] == '\0' + ? shell->runIgnTmpl + : shell->runChkTmpl; + cmdFlags.ignerr = FALSE; } - cmdTemplate = commandShell->errOffOrExecIgnore; - /* - * The error ignoration (hee hee) is already taken care - * of by the errOffOrExecIgnore template, so pretend error - * checking is still on. - */ - errOff = FALSE; - } else { - errOff = FALSE; - } - } else { - errOff = FALSE; } - } else { - /* - * If errors are being checked and the shell doesn't have error control - * but does supply an errExit template, then set up commands to run - * through it. - */ + if (DEBUG(SHELL) && strcmp(shellName, "sh") == 0) + ShellWriter_TraceOn(wr); - if (!commandShell->hasErrCtl && commandShell->errExit && - commandShell->errExit[0] != '\0') { - if (!(job->flags & JOB_SILENT) && !shutUp) { - if (commandShell->hasEchoCtl) - JobPrintln(job, commandShell->echoOff); - JobPrintf(job, commandShell->errOnOrEcho, escCmd); - shutUp = TRUE; - } - /* If it's a comment line or blank, treat as an ignored error */ - if (escCmd[0] == commandShell->commentChar || - (escCmd[0] == '\0')) - cmdTemplate = commandShell->errOffOrExecIgnore; - else - cmdTemplate = commandShell->errExit; - errOff = FALSE; - } - } + ShellWriter_PrintFmt(wr, cmdTemplate, xcmd); + free(xcmdStart); + free(escCmd); - if (DEBUG(SHELL) && strcmp(shellName, "sh") == 0 && - !(job->flags & JOB_TRACED)) { - JobPrintln(job, "set -x"); - job->flags |= JOB_TRACED; - } + if (cmdFlags.ignerr) + ShellWriter_ErrOn(wr, cmdFlags.echo && job->echo); - JobPrintf(job, cmdTemplate, cmd); - free(cmdStart); - free(escCmd); - if (errOff) { - /* - * If echoing is already off, there's no point in issuing the - * echoOff command. Otherwise we issue it and pretend it was on - * for the whole command... - */ - if (!shutUp && !(job->flags & JOB_SILENT) && commandShell->hasEchoCtl) { - JobPrintln(job, commandShell->echoOff); - shutUp = TRUE; - } - JobPrintln(job, commandShell->errOnOrEcho); - } - if (shutUp && commandShell->hasEchoCtl) - JobPrintln(job, commandShell->echoOn); + if (!cmdFlags.echo) + ShellWriter_EchoOn(wr); } -/* Print all commands to the shell file that is later executed. +/* + * Print all commands to the shell file that is later executed. * * The special command "..." stops printing and saves the remaining commands - * to be executed later. */ -static void + * to be executed later. + * + * Return whether at least one command was written to the shell file. + */ +static Boolean JobPrintCommands(Job *job) { - StringListNode *ln; + StringListNode *ln; + Boolean seen = FALSE; + ShellWriter wr = { job->cmdFILE, FALSE }; - for (ln = job->node->commands->first; ln != NULL; ln = ln->next) { - const char *cmd = ln->datum; + for (ln = job->node->commands.first; ln != NULL; ln = ln->next) { + const char *cmd = ln->datum; - if (strcmp(cmd, "...") == 0) { - job->node->type |= OP_SAVE_CMDS; - job->tailCmds = ln->next; - break; + if (strcmp(cmd, "...") == 0) { + job->node->type |= OP_SAVE_CMDS; + job->tailCmds = ln->next; + break; + } + + JobPrintCommand(job, &wr, ln, ln->datum); + seen = TRUE; } - JobPrintCommand(job, ln->datum); - } + return seen; } /* Save the delayed commands, to be executed when everything else is done. */ static void JobSaveCommands(Job *job) { - StringListNode *node; - - for (node = job->tailCmds; node != NULL; node = node->next) { - const char *cmd = node->datum; - char *expanded_cmd; - /* XXX: This Var_Subst is only intended to expand the dynamic - * variables such as .TARGET, .IMPSRC. It is not intended to - * expand the other variables as well; see deptgt-end.mk. */ - (void)Var_Subst(cmd, job->node, VARE_WANTRES, &expanded_cmd); - /* TODO: handle errors */ - Lst_Append(Targ_GetEndNode()->commands, expanded_cmd); - } + StringListNode *ln; + + for (ln = job->tailCmds; ln != NULL; ln = ln->next) { + const char *cmd = ln->datum; + char *expanded_cmd; + /* XXX: This Var_Subst is only intended to expand the dynamic + * variables such as .TARGET, .IMPSRC. It is not intended to + * expand the other variables as well; see deptgt-end.mk. */ + (void)Var_Subst(cmd, job->node, VARE_WANTRES, &expanded_cmd); + /* TODO: handle errors */ + Lst_Append(&Targ_GetEndNode()->commands, expanded_cmd); + } } /* Called to close both input and output pipes when a job is finished. */ static void JobClosePipes(Job *job) { - clearfd(job); - (void)close(job->outPipe); - job->outPipe = -1; + clearfd(job); + (void)close(job->outPipe); + job->outPipe = -1; + + JobDoOutput(job, TRUE); + (void)close(job->inPipe); + job->inPipe = -1; +} + +static void +JobFinishDoneExitedError(Job *job, WAIT_T *inout_status) +{ + SwitchOutputTo(job->node); +#ifdef USE_META + if (useMeta) { + meta_job_error(job, job->node, + job->ignerr, WEXITSTATUS(*inout_status)); + } +#endif + if (!shouldDieQuietly(job->node, -1)) { + (void)printf("*** [%s] Error code %d%s\n", + job->node->name, WEXITSTATUS(*inout_status), + job->ignerr ? " (ignored)" : ""); + } + + if (job->ignerr) + WAIT_STATUS(*inout_status) = 0; + else { + if (deleteOnError) + JobDeleteTarget(job->node); + PrintOnError(job->node, NULL); + } +} + +static void +JobFinishDoneExited(Job *job, WAIT_T *inout_status) +{ + DEBUG2(JOB, "Process %d [%s] exited.\n", job->pid, job->node->name); + + if (WEXITSTATUS(*inout_status) != 0) + JobFinishDoneExitedError(job, inout_status); + else if (DEBUG(JOB)) { + SwitchOutputTo(job->node); + (void)printf("*** [%s] Completed successfully\n", + job->node->name); + } +} + +static void +JobFinishDoneSignaled(Job *job, WAIT_T status) +{ + SwitchOutputTo(job->node); + (void)printf("*** [%s] Signal %d\n", job->node->name, WTERMSIG(status)); + if (deleteOnError) + JobDeleteTarget(job->node); +} + +static void +JobFinishDone(Job *job, WAIT_T *inout_status) +{ + if (WIFEXITED(*inout_status)) + JobFinishDoneExited(job, inout_status); + else + JobFinishDoneSignaled(job, *inout_status); - JobDoOutput(job, TRUE); - (void)close(job->inPipe); - job->inPipe = -1; + (void)fflush(stdout); } -/* Do final processing for the given job including updating parent nodes and +/* + * Do final processing for the given job including updating parent nodes and * starting new jobs as available/necessary. * * Deferred commands for the job are placed on the .END node. * - * If there was a serious error (errors != 0; not an ignored one), no more + * If there was a serious error (job_errors != 0; not an ignored one), no more * jobs will be started. * * Input: * job job to finish * status sub-why job went away */ static void JobFinish (Job *job, WAIT_T status) { - Boolean done, return_job_token; + Boolean done, return_job_token; - DEBUG3(JOB, "JobFinish: %d [%s], status %d\n", - job->pid, job->node->name, status); + DEBUG3(JOB, "JobFinish: %d [%s], status %d\n", + job->pid, job->node->name, status); - if ((WIFEXITED(status) && - ((WEXITSTATUS(status) != 0 && !(job->flags & JOB_IGNERR)))) || - WIFSIGNALED(status)) - { - /* - * If it exited non-zero and either we're doing things our - * way or we're not ignoring errors, the job is finished. - * Similarly, if the shell died because of a signal - * the job is also finished. In these - * cases, finish out the job's output before printing the exit - * status... - */ - JobClosePipes(job); - if (job->cmdFILE != NULL && job->cmdFILE != stdout) { - (void)fclose(job->cmdFILE); - job->cmdFILE = NULL; - } - done = TRUE; - } else if (WIFEXITED(status)) { - /* - * Deal with ignored errors in -B mode. We need to print a message - * telling of the ignored error as well as to run the next command. - * - */ - done = WEXITSTATUS(status) != 0; - JobClosePipes(job); - } else { - /* - * No need to close things down or anything. - */ - done = FALSE; - } + if ((WIFEXITED(status) && + ((WEXITSTATUS(status) != 0 && !job->ignerr))) || + WIFSIGNALED(status)) { + /* Finished because of an error. */ - if (done) { - if (WIFEXITED(status)) { - DEBUG2(JOB, "Process %d [%s] exited.\n", - job->pid, job->node->name); - if (WEXITSTATUS(status) != 0) { - if (job->node != lastNode) { - MESSAGE(stdout, job->node); - lastNode = job->node; - } -#ifdef USE_META - if (useMeta) { - meta_job_error(job, job->node, job->flags, WEXITSTATUS(status)); - } -#endif - if (!shouldDieQuietly(job->node, -1)) - (void)printf("*** [%s] Error code %d%s\n", - job->node->name, - WEXITSTATUS(status), - (job->flags & JOB_IGNERR) ? " (ignored)" : ""); - if (job->flags & JOB_IGNERR) { - WAIT_STATUS(status) = 0; - } else { - if (deleteOnError) { - JobDeleteTarget(job->node); - } - PrintOnError(job->node, NULL); - } - } else if (DEBUG(JOB)) { - if (job->node != lastNode) { - MESSAGE(stdout, job->node); - lastNode = job->node; + JobClosePipes(job); + if (job->cmdFILE != NULL && job->cmdFILE != stdout) { + (void)fclose(job->cmdFILE); + job->cmdFILE = NULL; } - (void)printf("*** [%s] Completed successfully\n", - job->node->name); - } + done = TRUE; + + } else if (WIFEXITED(status)) { + /* + * Deal with ignored errors in -B mode. We need to print a + * message telling of the ignored error as well as to run + * the next command. + */ + done = WEXITSTATUS(status) != 0; + + JobClosePipes(job); + } else { - if (job->node != lastNode) { - MESSAGE(stdout, job->node); - lastNode = job->node; - } - (void)printf("*** [%s] Signal %d\n", - job->node->name, WTERMSIG(status)); - if (deleteOnError) { - JobDeleteTarget(job->node); - } + /* No need to close things down or anything. */ + done = FALSE; } - (void)fflush(stdout); - } + + if (done) + JobFinishDone(job, &status); #ifdef USE_META - if (useMeta) { - int meta_status = meta_job_finish(job); - if (meta_status != 0 && status == 0) - status = meta_status; - } + if (useMeta) { + int meta_status = meta_job_finish(job); + if (meta_status != 0 && status == 0) + status = meta_status; + } #endif - return_job_token = FALSE; + return_job_token = FALSE; - Trace_Log(JOBEND, job); - if (!(job->flags & JOB_SPECIAL)) { - if (WAIT_STATUS(status) != 0 || - (aborting == ABORT_ERROR) || aborting == ABORT_INTERRUPT) - return_job_token = TRUE; - } + Trace_Log(JOBEND, job); + if (!job->special) { + if (WAIT_STATUS(status) != 0 || + (aborting == ABORT_ERROR) || aborting == ABORT_INTERRUPT) + return_job_token = TRUE; + } - if (aborting != ABORT_ERROR && aborting != ABORT_INTERRUPT && - (WAIT_STATUS(status) == 0)) { - /* - * As long as we aren't aborting and the job didn't return a non-zero - * status that we shouldn't ignore, we call Make_Update to update - * the parents. - */ - JobSaveCommands(job); - job->node->made = MADE; - if (!(job->flags & JOB_SPECIAL)) - return_job_token = TRUE; - Make_Update(job->node); - job->status = JOB_ST_FREE; - } else if (WAIT_STATUS(status)) { - errors++; - job->status = JOB_ST_FREE; - } + if (aborting != ABORT_ERROR && aborting != ABORT_INTERRUPT && + (WAIT_STATUS(status) == 0)) { + /* + * As long as we aren't aborting and the job didn't return a + * non-zero status that we shouldn't ignore, we call + * Make_Update to update the parents. + */ + JobSaveCommands(job); + job->node->made = MADE; + if (!job->special) + return_job_token = TRUE; + Make_Update(job->node); + job->status = JOB_ST_FREE; + } else if (status != 0) { + job_errors++; + job->status = JOB_ST_FREE; + } - if (errors > 0 && !opts.keepgoing && aborting != ABORT_INTERRUPT) - aborting = ABORT_ERROR; /* Prevent more jobs from getting started. */ + if (job_errors > 0 && !opts.keepgoing && aborting != ABORT_INTERRUPT) { + /* Prevent more jobs from getting started. */ + aborting = ABORT_ERROR; + } - if (return_job_token) - Job_TokenReturn(); + if (return_job_token) + Job_TokenReturn(); - if (aborting == ABORT_ERROR && jobTokensRunning == 0) - Finish(errors); + if (aborting == ABORT_ERROR && jobTokensRunning == 0) + Finish(job_errors); } static void TouchRegular(GNode *gn) { - const char *file = GNode_Path(gn); - struct utimbuf times = { now, now }; - int fd; - char c; - - if (utime(file, ×) >= 0) - return; - - fd = open(file, O_RDWR | O_CREAT, 0666); - if (fd < 0) { - (void)fprintf(stderr, "*** couldn't touch %s: %s\n", - file, strerror(errno)); - (void)fflush(stderr); - return; /* XXX: What about propagating the error? */ - } + const char *file = GNode_Path(gn); + struct utimbuf times = { now, now }; + int fd; + char c; + + if (utime(file, ×) >= 0) + return; + + fd = open(file, O_RDWR | O_CREAT, 0666); + if (fd < 0) { + (void)fprintf(stderr, "*** couldn't touch %s: %s\n", + file, strerror(errno)); + (void)fflush(stderr); + return; /* XXX: What about propagating the error? */ + } - /* Last resort: update the file's time stamps in the traditional way. - * XXX: This doesn't work for empty files, which are sometimes used - * as marker files. */ - if (read(fd, &c, 1) == 1) { - (void)lseek(fd, 0, SEEK_SET); - while (write(fd, &c, 1) == -1 && errno == EAGAIN) - continue; - } - (void)close(fd); /* XXX: What about propagating the error? */ + /* Last resort: update the file's time stamps in the traditional way. + * XXX: This doesn't work for empty files, which are sometimes used + * as marker files. */ + if (read(fd, &c, 1) == 1) { + (void)lseek(fd, 0, SEEK_SET); + while (write(fd, &c, 1) == -1 && errno == EAGAIN) + continue; + } + (void)close(fd); /* XXX: What about propagating the error? */ } -/* Touch the given target. Called by JobStart when the -t flag was given. +/* + * Touch the given target. Called by JobStart when the -t flag was given. * * The modification date of the file is changed. - * If the file did not exist, it is created. */ + * If the file did not exist, it is created. + */ void -Job_Touch(GNode *gn, Boolean silent) +Job_Touch(GNode *gn, Boolean echo) { - if (gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC|OP_OPTIONAL| - OP_SPECIAL|OP_PHONY)) { - /* These are "virtual" targets and should not really be created. */ - return; - } - - if (!silent || !GNode_ShouldExecute(gn)) { - (void)fprintf(stdout, "touch %s\n", gn->name); - (void)fflush(stdout); - } - - if (!GNode_ShouldExecute(gn)) - return; + if (gn->type & + (OP_JOIN | OP_USE | OP_USEBEFORE | OP_EXEC | OP_OPTIONAL | + OP_SPECIAL | OP_PHONY)) { + /* + * These are "virtual" targets and should not really be + * created. + */ + return; + } - if (gn->type & OP_ARCHV) { - Arch_Touch(gn); - return; - } + if (echo || !GNode_ShouldExecute(gn)) { + (void)fprintf(stdout, "touch %s\n", gn->name); + (void)fflush(stdout); + } - if (gn->type & OP_LIB) { - Arch_TouchLib(gn); - return; - } + if (!GNode_ShouldExecute(gn)) + return; - TouchRegular(gn); + if (gn->type & OP_ARCHV) + Arch_Touch(gn); + else if (gn->type & OP_LIB) + Arch_TouchLib(gn); + else + TouchRegular(gn); } -/* Make sure the given node has all the commands it needs. +/* + * Make sure the given node has all the commands it needs. * * The node will have commands from the .DEFAULT rule added to it if it * needs them. * * Input: * gn The target whose commands need verifying * abortProc Function to abort with message * * Results: * TRUE if the commands list is/was ok. */ Boolean Job_CheckCommands(GNode *gn, void (*abortProc)(const char *, ...)) { - if (GNode_IsTarget(gn)) - return TRUE; - if (!Lst_IsEmpty(gn->commands)) - return TRUE; - if ((gn->type & OP_LIB) && !Lst_IsEmpty(gn->children)) - return TRUE; + if (GNode_IsTarget(gn)) + return TRUE; + if (!Lst_IsEmpty(&gn->commands)) + return TRUE; + if ((gn->type & OP_LIB) && !Lst_IsEmpty(&gn->children)) + return TRUE; - /* - * No commands. Look for .DEFAULT rule from which we might infer - * commands. - */ - if (defaultNode != NULL && !Lst_IsEmpty(defaultNode->commands) && - !(gn->type & OP_SPECIAL)) { /* - * The traditional Make only looks for a .DEFAULT if the node was - * never the target of an operator, so that's what we do too. - * - * The .DEFAULT node acts like a transformation rule, in that - * gn also inherits any attributes or sources attached to - * .DEFAULT itself. + * No commands. Look for .DEFAULT rule from which we might infer + * commands. */ - Make_HandleUse(defaultNode, gn); - Var_Set(IMPSRC, GNode_VarTarget(gn), gn); - return TRUE; - } + if (defaultNode != NULL && !Lst_IsEmpty(&defaultNode->commands) && + !(gn->type & OP_SPECIAL)) { + /* + * The traditional Make only looks for a .DEFAULT if the node + * was never the target of an operator, so that's what we do + * too. + * + * The .DEFAULT node acts like a transformation rule, in that + * gn also inherits any attributes or sources attached to + * .DEFAULT itself. + */ + Make_HandleUse(defaultNode, gn); + Var_Set(IMPSRC, GNode_VarTarget(gn), gn); + return TRUE; + } - Dir_UpdateMTime(gn, FALSE); - if (gn->mtime != 0 || (gn->type & OP_SPECIAL)) - return TRUE; + Dir_UpdateMTime(gn, FALSE); + if (gn->mtime != 0 || (gn->type & OP_SPECIAL)) + return TRUE; - /* - * The node wasn't the target of an operator. We have no .DEFAULT - * rule to go on and the target doesn't already exist. There's - * nothing more we can do for this branch. If the -k flag wasn't - * given, we stop in our tracks, otherwise we just don't update - * this node's parents so they never get examined. - */ + /* + * The node wasn't the target of an operator. We have no .DEFAULT + * rule to go on and the target doesn't already exist. There's + * nothing more we can do for this branch. If the -k flag wasn't + * given, we stop in our tracks, otherwise we just don't update + * this node's parents so they never get examined. + */ - if (gn->flags & FROM_DEPEND) { - if (!Job_RunTarget(".STALE", gn->fname)) - fprintf(stdout, "%s: %s, %d: ignoring stale %s for %s\n", - progname, gn->fname, gn->lineno, makeDependfile, - gn->name); - return TRUE; - } + if (gn->flags & FROM_DEPEND) { + if (!Job_RunTarget(".STALE", gn->fname)) + fprintf(stdout, + "%s: %s, %d: ignoring stale %s for %s\n", + progname, gn->fname, gn->lineno, makeDependfile, + gn->name); + return TRUE; + } - if (gn->type & OP_OPTIONAL) { - (void)fprintf(stdout, "%s: don't know how to make %s (%s)\n", - progname, gn->name, "ignored"); - (void)fflush(stdout); - return TRUE; - } + if (gn->type & OP_OPTIONAL) { + (void)fprintf(stdout, "%s: don't know how to make %s (%s)\n", + progname, gn->name, "ignored"); + (void)fflush(stdout); + return TRUE; + } - if (opts.keepgoing) { - (void)fprintf(stdout, "%s: don't know how to make %s (%s)\n", - progname, gn->name, "continuing"); - (void)fflush(stdout); - return FALSE; - } + if (opts.keepgoing) { + (void)fprintf(stdout, "%s: don't know how to make %s (%s)\n", + progname, gn->name, "continuing"); + (void)fflush(stdout); + return FALSE; + } - abortProc("%s: don't know how to make %s. Stop", progname, gn->name); - return FALSE; + abortProc("%s: don't know how to make %s. Stop", progname, gn->name); + return FALSE; } -/* Execute the shell for the given job. +/* + * Execute the shell for the given job. * - * See Job_CatchOutput for handling the output of the shell. */ + * See Job_CatchOutput for handling the output of the shell. + */ static void JobExec(Job *job, char **argv) { - int cpid; /* ID of new child */ - sigset_t mask; - - job->flags &= ~JOB_TRACED; + int cpid; /* ID of new child */ + sigset_t mask; - if (DEBUG(JOB)) { - int i; + if (DEBUG(JOB)) { + int i; - debug_printf("Running %s\n", job->node->name); - debug_printf("\tCommand: "); - for (i = 0; argv[i] != NULL; i++) { - debug_printf("%s ", argv[i]); + debug_printf("Running %s\n", job->node->name); + debug_printf("\tCommand: "); + for (i = 0; argv[i] != NULL; i++) { + debug_printf("%s ", argv[i]); + } + debug_printf("\n"); } - debug_printf("\n"); - } - /* - * Some jobs produce no output and it's disconcerting to have - * no feedback of their running (since they produce no output, the - * banner with their name in it never appears). This is an attempt to - * provide that feedback, even if nothing follows it. - */ - if ((lastNode != job->node) && !(job->flags & JOB_SILENT)) { - MESSAGE(stdout, job->node); - lastNode = job->node; - } + /* + * Some jobs produce no output and it's disconcerting to have + * no feedback of their running (since they produce no output, the + * banner with their name in it never appears). This is an attempt to + * provide that feedback, even if nothing follows it. + */ + if (job->echo) + SwitchOutputTo(job->node); + + /* No interruptions until this job is on the `jobs' list */ + JobSigLock(&mask); - /* No interruptions until this job is on the `jobs' list */ - JobSigLock(&mask); + /* Pre-emptively mark job running, pid still zero though */ + job->status = JOB_ST_RUNNING; - /* Pre-emptively mark job running, pid still zero though */ - job->status = JOB_ST_RUNNING; + Var_ReexportVars(); - cpid = vFork(); - if (cpid == -1) - Punt("Cannot vfork: %s", strerror(errno)); + cpid = vFork(); + if (cpid == -1) + Punt("Cannot vfork: %s", strerror(errno)); - if (cpid == 0) { - /* Child */ - sigset_t tmask; + if (cpid == 0) { + /* Child */ + sigset_t tmask; #ifdef USE_META - if (useMeta) { - meta_job_child(job); - } + if (useMeta) { + meta_job_child(job); + } #endif - /* - * Reset all signal handlers; this is necessary because we also - * need to unblock signals before we exec(2). - */ - JobSigReset(); + /* + * Reset all signal handlers; this is necessary because we + * also need to unblock signals before we exec(2). + */ + JobSigReset(); - /* Now unblock signals */ - sigemptyset(&tmask); - JobSigUnlock(&tmask); + /* Now unblock signals */ + sigemptyset(&tmask); + JobSigUnlock(&tmask); - /* - * Must duplicate the input stream down to the child's input and - * reset it to the beginning (again). Since the stream was marked - * close-on-exec, we must clear that bit in the new input. - */ - if (dup2(fileno(job->cmdFILE), 0) == -1) - execDie("dup2", "job->cmdFILE"); - if (fcntl(0, F_SETFD, 0) == -1) - execDie("fcntl clear close-on-exec", "stdin"); - if (lseek(0, 0, SEEK_SET) == -1) - execDie("lseek to 0", "stdin"); - - if (job->node->type & (OP_MAKE | OP_SUBMAKE)) { - /* - * Pass job token pipe to submakes. - */ - if (fcntl(tokenWaitJob.inPipe, F_SETFD, 0) == -1) - execDie("clear close-on-exec", "tokenWaitJob.inPipe"); - if (fcntl(tokenWaitJob.outPipe, F_SETFD, 0) == -1) - execDie("clear close-on-exec", "tokenWaitJob.outPipe"); - } + /* + * Must duplicate the input stream down to the child's input + * and reset it to the beginning (again). Since the stream + * was marked close-on-exec, we must clear that bit in the + * new input. + */ + if (dup2(fileno(job->cmdFILE), 0) == -1) + execDie("dup2", "job->cmdFILE"); + if (fcntl(0, F_SETFD, 0) == -1) + execDie("fcntl clear close-on-exec", "stdin"); + if (lseek(0, 0, SEEK_SET) == -1) + execDie("lseek to 0", "stdin"); + + if (job->node->type & (OP_MAKE | OP_SUBMAKE)) { + /* + * Pass job token pipe to submakes. + */ + if (fcntl(tokenWaitJob.inPipe, F_SETFD, 0) == -1) + execDie("clear close-on-exec", + "tokenWaitJob.inPipe"); + if (fcntl(tokenWaitJob.outPipe, F_SETFD, 0) == -1) + execDie("clear close-on-exec", + "tokenWaitJob.outPipe"); + } - /* - * Set up the child's output to be routed through the pipe - * we've created for it. - */ - if (dup2(job->outPipe, 1) == -1) - execDie("dup2", "job->outPipe"); + /* + * Set up the child's output to be routed through the pipe + * we've created for it. + */ + if (dup2(job->outPipe, 1) == -1) + execDie("dup2", "job->outPipe"); - /* - * The output channels are marked close on exec. This bit was - * duplicated by the dup2(on some systems), so we have to clear - * it before routing the shell's error output to the same place as - * its standard output. - */ - if (fcntl(1, F_SETFD, 0) == -1) - execDie("clear close-on-exec", "stdout"); - if (dup2(1, 2) == -1) - execDie("dup2", "1, 2"); + /* + * The output channels are marked close on exec. This bit + * was duplicated by the dup2(on some systems), so we have + * to clear it before routing the shell's error output to + * the same place as its standard output. + */ + if (fcntl(1, F_SETFD, 0) == -1) + execDie("clear close-on-exec", "stdout"); + if (dup2(1, 2) == -1) + execDie("dup2", "1, 2"); - /* - * We want to switch the child into a different process family so - * we can kill it and all its descendants in one fell swoop, - * by killing its process family, but not commit suicide. - */ + /* + * We want to switch the child into a different process + * family so we can kill it and all its descendants in + * one fell swoop, by killing its process family, but not + * commit suicide. + */ #if defined(HAVE_SETPGID) - (void)setpgid(0, getpid()); + (void)setpgid(0, getpid()); #else #if defined(HAVE_SETSID) - /* XXX: dsl - I'm sure this should be setpgrp()... */ - (void)setsid(); + /* XXX: dsl - I'm sure this should be setpgrp()... */ + (void)setsid(); #else - (void)setpgrp(0, getpid()); + (void)setpgrp(0, getpid()); #endif #endif - Var_ExportVars(); - - (void)execv(shellPath, argv); - execDie("exec", shellPath); - } + (void)execv(shellPath, argv); + execDie("exec", shellPath); + } - /* Parent, continuing after the child exec */ - job->pid = cpid; + /* Parent, continuing after the child exec */ + job->pid = cpid; - Trace_Log(JOBSTART, job); + Trace_Log(JOBSTART, job); #ifdef USE_META - if (useMeta) { - meta_job_parent(job, cpid); - } + if (useMeta) { + meta_job_parent(job, cpid); + } #endif - /* - * Set the current position in the buffer to the beginning - * and mark another stream to watch in the outputs mask - */ - job->curPos = 0; + /* + * Set the current position in the buffer to the beginning + * and mark another stream to watch in the outputs mask + */ + job->curPos = 0; - watchfd(job); + watchfd(job); - if (job->cmdFILE != NULL && job->cmdFILE != stdout) { - (void)fclose(job->cmdFILE); - job->cmdFILE = NULL; - } + if (job->cmdFILE != NULL && job->cmdFILE != stdout) { + (void)fclose(job->cmdFILE); + job->cmdFILE = NULL; + } - /* - * Now the job is actually running, add it to the table. - */ - if (DEBUG(JOB)) { - debug_printf("JobExec(%s): pid %d added to jobs table\n", - job->node->name, job->pid); - job_table_dump("job started"); - } - JobSigUnlock(&mask); + /* + * Now the job is actually running, add it to the table. + */ + if (DEBUG(JOB)) { + debug_printf("JobExec(%s): pid %d added to jobs table\n", + job->node->name, job->pid); + job_table_dump("job started"); + } + JobSigUnlock(&mask); } /* Create the argv needed to execute the shell for a given job. */ static void JobMakeArgv(Job *job, char **argv) { - int argc; - static char args[10]; /* For merged arguments */ + int argc; + static char args[10]; /* For merged arguments */ - argv[0] = UNCONST(shellName); - argc = 1; - - if ((commandShell->exit && commandShell->exit[0] != '-') || - (commandShell->echo && commandShell->echo[0] != '-')) - { - /* - * At least one of the flags doesn't have a minus before it, so - * merge them together. Have to do this because the *(&(@*#*&#$# - * Bourne shell thinks its second argument is a file to source. - * Grrrr. Note the ten-character limitation on the combined arguments. - */ - (void)snprintf(args, sizeof args, "-%s%s", - ((job->flags & JOB_IGNERR) ? "" : - (commandShell->exit ? commandShell->exit : "")), - ((job->flags & JOB_SILENT) ? "" : - (commandShell->echo ? commandShell->echo : ""))); + argv[0] = UNCONST(shellName); + argc = 1; - if (args[1]) { - argv[argc] = args; - argc++; - } - } else { - if (!(job->flags & JOB_IGNERR) && commandShell->exit) { - argv[argc] = UNCONST(commandShell->exit); - argc++; - } - if (!(job->flags & JOB_SILENT) && commandShell->echo) { - argv[argc] = UNCONST(commandShell->echo); - argc++; + if ((shell->errFlag != NULL && shell->errFlag[0] != '-') || + (shell->echoFlag != NULL && shell->echoFlag[0] != '-')) { + /* + * At least one of the flags doesn't have a minus before it, + * so merge them together. Have to do this because the Bourne + * shell thinks its second argument is a file to source. + * Grrrr. Note the ten-character limitation on the combined + * arguments. + * + * TODO: Research until when the above comments were + * practically relevant. + */ + (void)snprintf(args, sizeof args, "-%s%s", + (job->ignerr ? "" : + (shell->errFlag != NULL ? shell->errFlag : "")), + (!job->echo ? "" : + (shell->echoFlag != NULL ? shell->echoFlag : ""))); + + if (args[1] != '\0') { + argv[argc] = args; + argc++; + } + } else { + if (!job->ignerr && shell->errFlag != NULL) { + argv[argc] = UNCONST(shell->errFlag); + argc++; + } + if (job->echo && shell->echoFlag != NULL) { + argv[argc] = UNCONST(shell->echoFlag); + argc++; + } } - } - argv[argc] = NULL; + argv[argc] = NULL; } -/*- - *----------------------------------------------------------------------- - * JobStart -- - * Start a target-creation process going for the target described - * by the graph node gn. - * - * Input: - * gn target to create - * flags flags for the job to override normal ones. - * previous The previous Job structure for this node, if any. - * - * Results: - * JOB_ERROR if there was an error in the commands, JOB_FINISHED - * if there isn't actually anything left to do for the job and - * JOB_RUNNING if the job has been started. - * - * Side Effects: - * A new Job node is created and added to the list of running - * jobs. PMake is forked and a child shell created. - * - * NB: The return value is ignored by everyone. - *----------------------------------------------------------------------- - */ -static JobStartResult -JobStart(GNode *gn, JobFlags flags) +static void +JobOpenTmpFile(Job *job, GNode *gn, Boolean cmdsOK, Boolean *out_run) { - Job *job; /* new job descriptor */ - char *argv[10]; /* Argument vector to shell */ - Boolean cmdsOK; /* true if the nodes commands were all right */ - Boolean noExec; /* Set true if we decide not to run the job */ - int tfd; /* File descriptor to the temp file */ - - for (job = job_table; job < job_table_end; job++) { - if (job->status == JOB_ST_FREE) - break; - } - if (job >= job_table_end) - Punt("JobStart no job slots vacant"); - - memset(job, 0, sizeof *job); - job->node = gn; - job->tailCmds = NULL; - job->status = JOB_ST_SET_UP; - - if (gn->type & OP_SPECIAL) - flags |= JOB_SPECIAL; - if (Targ_Ignore(gn)) - flags |= JOB_IGNERR; - if (Targ_Silent(gn)) - flags |= JOB_SILENT; - job->flags = flags; - - /* - * Check the commands now so any attributes from .DEFAULT have a chance - * to migrate to the node - */ - cmdsOK = Job_CheckCommands(gn, Error); - - job->inPollfd = NULL; - /* - * If the -n flag wasn't given, we open up OUR (not the child's) - * temporary file to stuff commands in it. The thing is rd/wr so we don't - * need to reopen it to feed it to the shell. If the -n flag *was* given, - * we just set the file to be stdout. Cute, huh? - */ - if (((gn->type & OP_MAKE) && !opts.noRecursiveExecute) || - (!opts.noExecute && !opts.touchFlag)) { /* - * tfile is the name of a file into which all shell commands are - * put. It is removed before the child shell is executed, unless - * DEBUG(SCRIPT) is set. + * tfile is the name of a file into which all shell commands + * are put. It is removed before the child shell is executed, + * unless DEBUG(SCRIPT) is set. */ char *tfile; sigset_t mask; + int tfd; /* File descriptor to the temp file */ + /* * We're serious here, but if the commands were bogus, we're * also dead... */ if (!cmdsOK) { - PrintOnError(gn, NULL); /* provide some clue */ - DieHorribly(); + PrintOnError(gn, NULL); /* provide some clue */ + DieHorribly(); } JobSigLock(&mask); tfd = mkTempFile(TMPPAT, &tfile); if (!DEBUG(SCRIPT)) - (void)eunlink(tfile); + (void)eunlink(tfile); JobSigUnlock(&mask); job->cmdFILE = fdopen(tfd, "w+"); if (job->cmdFILE == NULL) - Punt("Could not fdopen %s", tfile); + Punt("Could not fdopen %s", tfile); (void)fcntl(fileno(job->cmdFILE), F_SETFD, FD_CLOEXEC); /* - * Send the commands to the command file, flush all its buffers then - * rewind and remove the thing. + * Send the commands to the command file, flush all its + * buffers then rewind and remove the thing. */ - noExec = FALSE; + *out_run = TRUE; #ifdef USE_META if (useMeta) { - meta_job_start(job, gn); - if (Targ_Silent(gn)) /* might have changed */ - job->flags |= JOB_SILENT; + meta_job_start(job, gn); + if (gn->type & OP_SILENT) /* might have changed */ + job->echo = FALSE; } #endif - /* - * We can do all the commands at once. hooray for sanity - */ - numCommands = 0; - JobPrintCommands(job); - /* - * If we didn't print out any commands to the shell script, - * there's not much point in executing the shell, is there? - */ - if (numCommands == 0) { - noExec = TRUE; - } + /* We can do all the commands at once. hooray for sanity */ + if (!JobPrintCommands(job)) + *out_run = FALSE; free(tfile); - } else if (!GNode_ShouldExecute(gn)) { - /* - * Not executing anything -- just print all the commands to stdout - * in one fell swoop. This will still set up job->tailCmds correctly. - */ - if (lastNode != gn) { - MESSAGE(stdout, gn); - lastNode = gn; +} + +/* + * Start a target-creation process going for the target described by the + * graph node gn. + * + * Input: + * gn target to create + * flags flags for the job to override normal ones. + * previous The previous Job structure for this node, if any. + * + * Results: + * JOB_ERROR if there was an error in the commands, JOB_FINISHED + * if there isn't actually anything left to do for the job and + * JOB_RUNNING if the job has been started. + * + * Side Effects: + * A new Job node is created and added to the list of running + * jobs. PMake is forked and a child shell created. + * + * NB: The return value is ignored by everyone. + */ +static JobStartResult +JobStart(GNode *gn, Boolean special) +{ + Job *job; /* new job descriptor */ + char *argv[10]; /* Argument vector to shell */ + Boolean cmdsOK; /* true if the nodes commands were all right */ + Boolean run; + + for (job = job_table; job < job_table_end; job++) { + if (job->status == JOB_ST_FREE) + break; } - job->cmdFILE = stdout; - /* - * Only print the commands if they're ok, but don't die if they're - * not -- just let the user know they're bad and keep going. It - * doesn't do any harm in this case and may do some good. - */ - if (cmdsOK) - JobPrintCommands(job); - /* - * Don't execute the shell, thank you. - */ - noExec = TRUE; - } else { + if (job >= job_table_end) + Punt("JobStart no job slots vacant"); + + memset(job, 0, sizeof *job); + job->node = gn; + job->tailCmds = NULL; + job->status = JOB_ST_SET_UP; + + job->special = special || gn->type & OP_SPECIAL; + job->ignerr = opts.ignoreErrors || gn->type & OP_IGNORE; + job->echo = !(opts.beSilent || gn->type & OP_SILENT); + /* - * Just touch the target and note that no shell should be executed. - * Set cmdFILE to stdout to make life easier. Check the commands, too, - * but don't die if they're no good -- it does no harm to keep working - * up the graph. + * Check the commands now so any attributes from .DEFAULT have a + * chance to migrate to the node. */ - job->cmdFILE = stdout; - Job_Touch(gn, job->flags & JOB_SILENT); - noExec = TRUE; - } - /* Just in case it isn't already... */ - (void)fflush(job->cmdFILE); + cmdsOK = Job_CheckCommands(gn, Error); - /* - * If we're not supposed to execute a shell, don't. - */ - if (noExec) { - if (!(job->flags & JOB_SPECIAL)) - Job_TokenReturn(); + job->inPollfd = NULL; /* - * Unlink and close the command file if we opened one + * If the -n flag wasn't given, we open up OUR (not the child's) + * temporary file to stuff commands in it. The thing is rd/wr so + * we don't need to reopen it to feed it to the shell. If the -n + * flag *was* given, we just set the file to be stdout. Cute, huh? */ - if (job->cmdFILE != NULL && job->cmdFILE != stdout) { - (void)fclose(job->cmdFILE); - job->cmdFILE = NULL; + if (((gn->type & OP_MAKE) && !opts.noRecursiveExecute) || + (!opts.noExecute && !opts.touchFlag)) { + JobOpenTmpFile(job, gn, cmdsOK, &run); + } else if (!GNode_ShouldExecute(gn)) { + /* + * Not executing anything -- just print all the commands to + * stdout in one fell swoop. This will still set up + * job->tailCmds correctly. + */ + SwitchOutputTo(gn); + job->cmdFILE = stdout; + /* + * Only print the commands if they're ok, but don't die if + * they're not -- just let the user know they're bad and + * keep going. It doesn't do any harm in this case and may + * do some good. + */ + if (cmdsOK) + JobPrintCommands(job); + /* Don't execute the shell, thank you. */ + run = FALSE; + } else { + /* + * Just touch the target and note that no shell should be + * executed. Set cmdFILE to stdout to make life easier. + * Check the commands, too, but don't die if they're no + * good -- it does no harm to keep working up the graph. + */ + job->cmdFILE = stdout; + Job_Touch(gn, job->echo); + run = FALSE; } + /* Just in case it isn't already... */ + (void)fflush(job->cmdFILE); + + /* If we're not supposed to execute a shell, don't. */ + if (!run) { + if (!job->special) + Job_TokenReturn(); + /* Unlink and close the command file if we opened one */ + if (job->cmdFILE != NULL && job->cmdFILE != stdout) { + (void)fclose(job->cmdFILE); + job->cmdFILE = NULL; + } - /* - * We only want to work our way up the graph if we aren't here because - * the commands for the job were no good. - */ - if (cmdsOK && aborting == ABORT_NONE) { - JobSaveCommands(job); - job->node->made = MADE; - Make_Update(job->node); + /* + * We only want to work our way up the graph if we aren't + * here because the commands for the job were no good. + */ + if (cmdsOK && aborting == ABORT_NONE) { + JobSaveCommands(job); + job->node->made = MADE; + Make_Update(job->node); + } + job->status = JOB_ST_FREE; + return cmdsOK ? JOB_FINISHED : JOB_ERROR; } - job->status = JOB_ST_FREE; - return cmdsOK ? JOB_FINISHED : JOB_ERROR; - } - /* - * Set up the control arguments to the shell. This is based on the flags - * set earlier for this job. - */ - JobMakeArgv(job, argv); + /* + * Set up the control arguments to the shell. This is based on the + * flags set earlier for this job. + */ + JobMakeArgv(job, argv); - /* Create the pipe by which we'll get the shell's output. */ - JobCreatePipe(job, 3); + /* Create the pipe by which we'll get the shell's output. */ + JobCreatePipe(job, 3); - JobExec(job, argv); - return JOB_RUNNING; + JobExec(job, argv); + return JOB_RUNNING; } -/* Print the output of the shell command, skipping the noPrint command of - * the shell, if any. */ +/* + * Print the output of the shell command, skipping the noPrint text of the + * shell, if any. The default shell does not have noPrint though, which means + * that in all practical cases, handling the output is left to the caller. + */ static char * -JobOutput(Job *job, char *cp, char *endp) +JobOutput(char *cp, char *endp) /* XXX: should all be const */ { - char *ecp; + char *ecp; /* XXX: should be const */ - if (commandShell->noPrint == NULL || commandShell->noPrint[0] == '\0') - return cp; + if (shell->noPrint == NULL || shell->noPrint[0] == '\0') + return cp; - while ((ecp = strstr(cp, commandShell->noPrint)) != NULL) { - if (ecp != cp) { - *ecp = '\0'; - /* - * The only way there wouldn't be a newline after - * this line is if it were the last in the buffer. - * however, since the non-printable comes after it, - * there must be a newline, so we don't print one. - */ - (void)fprintf(stdout, "%s", cp); - (void)fflush(stdout); - } - cp = ecp + commandShell->noPrintLen; - if (cp != endp) { - /* - * Still more to print, look again after skipping - * the whitespace following the non-printable - * command.... - */ - cp++; - pp_skip_whitespace(&cp); - } else { - return cp; + /* + * XXX: What happens if shell->noPrint occurs on the boundary of + * the buffer? To work correctly in all cases, this should rather + * be a proper stream filter instead of doing string matching on + * selected chunks of the output. + */ + while ((ecp = strstr(cp, shell->noPrint)) != NULL) { + if (ecp != cp) { + *ecp = '\0'; /* XXX: avoid writing to the buffer */ + /* + * The only way there wouldn't be a newline after + * this line is if it were the last in the buffer. + * however, since the noPrint output comes after it, + * there must be a newline, so we don't print one. + */ + /* XXX: What about null bytes in the output? */ + (void)fprintf(stdout, "%s", cp); + (void)fflush(stdout); + } + cp = ecp + shell->noPrintLen; + if (cp == endp) + break; + cp++; /* skip over the (XXX: assumed) newline */ + pp_skip_whitespace(&cp); } - } - return cp; + return cp; } /* * This function is called whenever there is something to read on the pipe. * We collect more output from the given job and store it in the job's * outBuf. If this makes up a line, we print it tagged by the job's * identifier, as necessary. * * In the output of the shell, the 'noPrint' lines are removed. If the * command is not alone on the line (the character after it is not \0 or * \n), we do print whatever follows it. * * Input: * job the job whose output needs printing * finish TRUE if this is the last time we'll be called * for this job */ static void JobDoOutput(Job *job, Boolean finish) { - Boolean gotNL = FALSE; /* true if got a newline */ - Boolean fbuf; /* true if our buffer filled up */ - size_t nr; /* number of bytes read */ - size_t i; /* auxiliary index into outBuf */ - size_t max; /* limit for i (end of current data) */ - ssize_t nRead; /* (Temporary) number of bytes read */ - - /* - * Read as many bytes as will fit in the buffer. - */ + Boolean gotNL; /* true if got a newline */ + Boolean fbuf; /* true if our buffer filled up */ + size_t nr; /* number of bytes read */ + size_t i; /* auxiliary index into outBuf */ + size_t max; /* limit for i (end of current data) */ + ssize_t nRead; /* (Temporary) number of bytes read */ + + /* Read as many bytes as will fit in the buffer. */ again: - gotNL = FALSE; - fbuf = FALSE; - - nRead = read(job->inPipe, &job->outBuf[job->curPos], - JOB_BUFSIZE - job->curPos); - if (nRead < 0) { - if (errno == EAGAIN) - return; - if (DEBUG(JOB)) { - perror("JobDoOutput(piperead)"); + gotNL = FALSE; + fbuf = FALSE; + + nRead = read(job->inPipe, &job->outBuf[job->curPos], + JOB_BUFSIZE - job->curPos); + if (nRead < 0) { + if (errno == EAGAIN) + return; + if (DEBUG(JOB)) { + perror("JobDoOutput(piperead)"); + } + nr = 0; + } else { + nr = (size_t)nRead; } - nr = 0; - } else { - nr = (size_t)nRead; - } - - /* - * If we hit the end-of-file (the job is dead), we must flush its - * remaining output, so pretend we read a newline if there's any - * output remaining in the buffer. - * Also clear the 'finish' flag so we stop looping. - */ - if (nr == 0 && job->curPos != 0) { - job->outBuf[job->curPos] = '\n'; - nr = 1; - finish = FALSE; - } else if (nr == 0) { - finish = FALSE; - } - /* - * Look for the last newline in the bytes we just got. If there is - * one, break out of the loop with 'i' as its index and gotNL set - * TRUE. - */ - max = job->curPos + nr; - for (i = job->curPos + nr - 1; i >= job->curPos && i != (size_t)-1; i--) { - if (job->outBuf[i] == '\n') { - gotNL = TRUE; - break; - } else if (job->outBuf[i] == '\0') { - /* - * Why? - */ - job->outBuf[i] = ' '; + /* + * If we hit the end-of-file (the job is dead), we must flush its + * remaining output, so pretend we read a newline if there's any + * output remaining in the buffer. + * Also clear the 'finish' flag so we stop looping. + */ + if (nr == 0 && job->curPos != 0) { + job->outBuf[job->curPos] = '\n'; + nr = 1; + finish = FALSE; + } else if (nr == 0) { + finish = FALSE; } - } - if (!gotNL) { - job->curPos += nr; - if (job->curPos == JOB_BUFSIZE) { - /* - * If we've run out of buffer space, we have no choice - * but to print the stuff. sigh. - */ - fbuf = TRUE; - i = job->curPos; - } - } - if (gotNL || fbuf) { /* - * Need to send the output to the screen. Null terminate it - * first, overwriting the newline character if there was one. - * So long as the line isn't one we should filter (according - * to the shell description), we print the line, preceded - * by a target banner if this target isn't the same as the - * one for which we last printed something. - * The rest of the data in the buffer are then shifted down - * to the start of the buffer and curPos is set accordingly. + * Look for the last newline in the bytes we just got. If there is + * one, break out of the loop with 'i' as its index and gotNL set + * TRUE. */ - job->outBuf[i] = '\0'; - if (i >= job->curPos) { - char *cp; - - cp = JobOutput(job, job->outBuf, &job->outBuf[i]); - - /* - * There's still more in that thar buffer. This time, though, - * we know there's no newline at the end, so we add one of - * our own free will. - */ - if (*cp != '\0') { - if (!opts.beSilent && job->node != lastNode) { - MESSAGE(stdout, job->node); - lastNode = job->node; + max = job->curPos + nr; + for (i = job->curPos + nr - 1; + i >= job->curPos && i != (size_t)-1; i--) { + if (job->outBuf[i] == '\n') { + gotNL = TRUE; + break; + } else if (job->outBuf[i] == '\0') { + /* + * Why? + */ + job->outBuf[i] = ' '; } -#ifdef USE_META - if (useMeta) { - meta_job_output(job, cp, gotNL ? "\n" : ""); + } + + if (!gotNL) { + job->curPos += nr; + if (job->curPos == JOB_BUFSIZE) { + /* + * If we've run out of buffer space, we have no choice + * but to print the stuff. sigh. + */ + fbuf = TRUE; + i = job->curPos; } + } + if (gotNL || fbuf) { + /* + * Need to send the output to the screen. Null terminate it + * first, overwriting the newline character if there was one. + * So long as the line isn't one we should filter (according + * to the shell description), we print the line, preceded + * by a target banner if this target isn't the same as the + * one for which we last printed something. + * The rest of the data in the buffer are then shifted down + * to the start of the buffer and curPos is set accordingly. + */ + job->outBuf[i] = '\0'; + if (i >= job->curPos) { + char *cp; + + cp = JobOutput(job->outBuf, &job->outBuf[i]); + + /* + * There's still more in that thar buffer. This time, + * though, we know there's no newline at the end, so + * we add one of our own free will. + */ + if (*cp != '\0') { + if (!opts.beSilent) + SwitchOutputTo(job->node); +#ifdef USE_META + if (useMeta) { + meta_job_output(job, cp, + gotNL ? "\n" : ""); + } #endif - (void)fprintf(stdout, "%s%s", cp, gotNL ? "\n" : ""); - (void)fflush(stdout); - } + (void)fprintf(stdout, "%s%s", cp, + gotNL ? "\n" : ""); + (void)fflush(stdout); + } + } + /* + * max is the last offset still in the buffer. Move any + * remaining characters to the start of the buffer and + * update the end marker curPos. + */ + if (i < max) { + (void)memmove(job->outBuf, &job->outBuf[i + 1], + max - (i + 1)); + job->curPos = max - (i + 1); + } else { + assert(i == max); + job->curPos = 0; + } } - /* - * max is the last offset still in the buffer. Move any remaining - * characters to the start of the buffer and update the end marker - * curPos. - */ - if (i < max) { - (void)memmove(job->outBuf, &job->outBuf[i + 1], max - (i + 1)); - job->curPos = max - (i + 1); - } else { - assert(i == max); - job->curPos = 0; + if (finish) { + /* + * If the finish flag is true, we must loop until we hit + * end-of-file on the pipe. This is guaranteed to happen + * eventually since the other end of the pipe is now closed + * (we closed it explicitly and the child has exited). When + * we do get an EOF, finish will be set FALSE and we'll fall + * through and out. + */ + goto again; } - } - if (finish) { - /* - * If the finish flag is true, we must loop until we hit - * end-of-file on the pipe. This is guaranteed to happen - * eventually since the other end of the pipe is now closed - * (we closed it explicitly and the child has exited). When - * we do get an EOF, finish will be set FALSE and we'll fall - * through and out. - */ - goto again; - } } static void JobRun(GNode *targ) { #if 0 - /* - * Unfortunately it is too complicated to run .BEGIN, .END, and - * .INTERRUPT job in the parallel job module. As of 2020-09-25, - * unit-tests/deptgt-end-jobs.mk hangs in an endless loop. - * - * Running these jobs in compat mode also guarantees that these - * jobs do not overlap with other unrelated jobs. - */ - List *lst = Lst_New(); - Lst_Append(lst, targ); - (void)Make_Run(lst); - Lst_Destroy(lst, NULL); - JobStart(targ, JOB_SPECIAL); - while (jobTokensRunning) { - Job_CatchOutput(); - } + /* + * Unfortunately it is too complicated to run .BEGIN, .END, and + * .INTERRUPT job in the parallel job module. As of 2020-09-25, + * unit-tests/deptgt-end-jobs.mk hangs in an endless loop. + * + * Running these jobs in compat mode also guarantees that these + * jobs do not overlap with other unrelated jobs. + */ + List *lst = Lst_New(); + Lst_Append(lst, targ); + (void)Make_Run(lst); + Lst_Destroy(lst, NULL); + JobStart(targ, JOB_SPECIAL); + while (jobTokensRunning != 0) { + Job_CatchOutput(); + } #else - Compat_Make(targ, targ); - if (targ->made == ERROR) { - PrintOnError(targ, "\n\nStop."); - exit(1); - } + Compat_Make(targ, targ); + /* XXX: Replace with GNode_IsError(gn) */ + if (targ->made == ERROR) { + PrintOnError(targ, "\n\nStop."); + exit(1); + } #endif } -/* Handle the exit of a child. Called from Make_Make. +/* + * Handle the exit of a child. Called from Make_Make. * * The job descriptor is removed from the list of children. * * Notes: * We do waits, blocking or not, according to the wisdom of our * caller, until there are no more children to report. For each * job, call JobFinish to finish things off. */ void Job_CatchChildren(void) { - int pid; /* pid of dead child */ - WAIT_T status; /* Exit/termination status */ + int pid; /* pid of dead child */ + WAIT_T status; /* Exit/termination status */ - /* - * Don't even bother if we know there's no one around. - */ - if (jobTokensRunning == 0) - return; + /* Don't even bother if we know there's no one around. */ + if (jobTokensRunning == 0) + return; - while ((pid = waitpid((pid_t) -1, &status, WNOHANG | WUNTRACED)) > 0) { - DEBUG2(JOB, "Process %d exited/stopped status %x.\n", pid, - WAIT_STATUS(status)); - JobReapChild(pid, status, TRUE); - } + while ((pid = waitpid((pid_t)-1, &status, WNOHANG | WUNTRACED)) > 0) { + DEBUG2(JOB, "Process %d exited/stopped status %x.\n", + pid, WAIT_STATUS(status)); + JobReapChild(pid, status, TRUE); + } } /* * It is possible that wait[pid]() was called from elsewhere, * this lets us reap jobs regardless. */ void JobReapChild(pid_t pid, WAIT_T status, Boolean isJobs) { - Job *job; /* job descriptor for dead child */ - - /* - * Don't even bother if we know there's no one around. - */ - if (jobTokensRunning == 0) - return; - - job = JobFindPid(pid, JOB_ST_RUNNING, isJobs); - if (job == NULL) { - if (isJobs) { - if (!lurking_children) - Error("Child (%d) status %x not in table?", pid, status); + Job *job; /* job descriptor for dead child */ + + /* Don't even bother if we know there's no one around. */ + if (jobTokensRunning == 0) + return; + + job = JobFindPid(pid, JOB_ST_RUNNING, isJobs); + if (job == NULL) { + if (isJobs) { + if (!lurking_children) + Error("Child (%d) status %x not in table?", + pid, status); + } + return; /* not ours */ } - return; /* not ours */ - } - if (WIFSTOPPED(status)) { - DEBUG2(JOB, "Process %d (%s) stopped.\n", job->pid, job->node->name); - if (!make_suspended) { - switch (WSTOPSIG(status)) { - case SIGTSTP: - (void)printf("*** [%s] Suspended\n", job->node->name); - break; - case SIGSTOP: - (void)printf("*** [%s] Stopped\n", job->node->name); - break; - default: - (void)printf("*** [%s] Stopped -- signal %d\n", - job->node->name, WSTOPSIG(status)); - } - job->suspended = TRUE; + if (WIFSTOPPED(status)) { + DEBUG2(JOB, "Process %d (%s) stopped.\n", + job->pid, job->node->name); + if (!make_suspended) { + switch (WSTOPSIG(status)) { + case SIGTSTP: + (void)printf("*** [%s] Suspended\n", + job->node->name); + break; + case SIGSTOP: + (void)printf("*** [%s] Stopped\n", + job->node->name); + break; + default: + (void)printf("*** [%s] Stopped -- signal %d\n", + job->node->name, WSTOPSIG(status)); + } + job->suspended = TRUE; + } + (void)fflush(stdout); + return; } - (void)fflush(stdout); - return; - } - job->status = JOB_ST_FINISHED; - job->exit_status = WAIT_STATUS(status); + job->status = JOB_ST_FINISHED; + job->exit_status = WAIT_STATUS(status); - JobFinish(job, status); + JobFinish(job, status); } -/* Catch the output from our children, if we're using pipes do so. Otherwise +/* + * Catch the output from our children, if we're using pipes do so. Otherwise * just block time until we get a signal(most likely a SIGCHLD) since there's * no point in just spinning when there's nothing to do and the reaping of a - * child can wait for a while. */ + * child can wait for a while. + */ void Job_CatchOutput(void) { - int nready; - Job *job; - unsigned int i; + int nready; + Job *job; + unsigned int i; - (void)fflush(stdout); - - /* The first fd in the list is the job token pipe */ - do { - nready = poll(fds + 1 - wantToken, nfds - 1 + wantToken, POLL_MSEC); - } while (nready < 0 && errno == EINTR); - - if (nready < 0) - Punt("poll: %s", strerror(errno)); + (void)fflush(stdout); - if (nready > 0 && readyfd(&childExitJob)) { - char token = 0; - ssize_t count; - count = read(childExitJob.inPipe, &token, 1); - switch (count) { - case 0: - Punt("unexpected eof on token pipe"); - case -1: - Punt("token pipe read: %s", strerror(errno)); - case 1: - if (token == DO_JOB_RESUME[0]) - /* Complete relay requested from our SIGCONT handler */ - JobRestartJobs(); - break; - default: - abort(); - } - nready--; - } + /* The first fd in the list is the job token pipe */ + do { + nready = poll(fds + 1 - wantToken, nJobs - 1 + wantToken, + POLL_MSEC); + } while (nready < 0 && errno == EINTR); + + if (nready < 0) + Punt("poll: %s", strerror(errno)); + + if (nready > 0 && readyfd(&childExitJob)) { + char token = 0; + ssize_t count; + count = read(childExitJob.inPipe, &token, 1); + switch (count) { + case 0: + Punt("unexpected eof on token pipe"); + /*NOTREACHED*/ + case -1: + Punt("token pipe read: %s", strerror(errno)); + /*NOTREACHED*/ + case 1: + if (token == DO_JOB_RESUME[0]) + /* + * Complete relay requested from our SIGCONT + * handler + */ + JobRestartJobs(); + break; + default: + abort(); + } + nready--; + } - Job_CatchChildren(); - if (nready == 0) - return; + Job_CatchChildren(); + if (nready == 0) + return; - for (i = npseudojobs * nfds_per_job(); i < nfds; i++) { - if (!fds[i].revents) - continue; - job = jobfds[i]; - if (job->status == JOB_ST_RUNNING) - JobDoOutput(job, FALSE); + for (i = npseudojobs * nfds_per_job(); i < nJobs; i++) { + if (fds[i].revents == 0) + continue; + job = allJobs[i]; + if (job->status == JOB_ST_RUNNING) + JobDoOutput(job, FALSE); #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) - /* - * With meta mode, we may have activity on the job's filemon - * descriptor too, which at the moment is any pollfd other than - * job->inPollfd. - */ - if (useMeta && job->inPollfd != &fds[i]) { - if (meta_job_event(job) <= 0) { - fds[i].events = 0; /* never mind */ - } - } + /* + * With meta mode, we may have activity on the job's filemon + * descriptor too, which at the moment is any pollfd other + * than job->inPollfd. + */ + if (useMeta && job->inPollfd != &fds[i]) { + if (meta_job_event(job) <= 0) { + fds[i].events = 0; /* never mind */ + } + } #endif - if (--nready == 0) - return; - } + if (--nready == 0) + return; + } } -/* Start the creation of a target. Basically a front-end for JobStart used by - * the Make module. */ +/* + * Start the creation of a target. Basically a front-end for JobStart used by + * the Make module. + */ void Job_Make(GNode *gn) { - (void)JobStart(gn, JOB_NONE); + (void)JobStart(gn, FALSE); } -void -Shell_Init(void) +static void +InitShellNameAndPath(void) { - if (shellPath == NULL) { - /* - * We are using the default shell, which may be an absolute - * path if DEFSHELL_CUSTOM is defined. - */ - shellName = commandShell->name; + shellName = shell->name; + #ifdef DEFSHELL_CUSTOM - if (*shellName == '/') { - shellPath = shellName; - shellName = strrchr(shellPath, '/'); - shellName++; - } else + if (shellName[0] == '/') { + shellPath = shellName; + shellName = str_basename(shellPath); + return; + } #endif + shellPath = str_concat3(_PATH_DEFSHELLDIR, "/", shellName); - } - Var_SetWithFlags(".SHELL", shellPath, VAR_CMDLINE, VAR_SET_READONLY); - if (commandShell->exit == NULL) { - commandShell->exit = ""; - } - if (commandShell->echo == NULL) { - commandShell->echo = ""; - } - if (commandShell->hasErrCtl && commandShell->exit[0] != '\0') { - if (shellErrFlag && - strcmp(commandShell->exit, &shellErrFlag[1]) != 0) { - free(shellErrFlag); - shellErrFlag = NULL; - } - if (!shellErrFlag) { - size_t n = strlen(commandShell->exit) + 2; - - shellErrFlag = bmake_malloc(n); - if (shellErrFlag) { - snprintf(shellErrFlag, n, "-%s", commandShell->exit); - } - } - } else if (shellErrFlag) { - free(shellErrFlag); - shellErrFlag = NULL; - } } -/* Return the string literal that is used in the current command shell - * to produce a newline character. */ +void +Shell_Init(void) +{ + if (shellPath == NULL) + InitShellNameAndPath(); + + Var_SetWithFlags(".SHELL", shellPath, VAR_CMDLINE, VAR_SET_READONLY); + if (shell->errFlag == NULL) + shell->errFlag = ""; + if (shell->echoFlag == NULL) + shell->echoFlag = ""; + if (shell->hasErrCtl && shell->errFlag[0] != '\0') { + if (shellErrFlag != NULL && + strcmp(shell->errFlag, &shellErrFlag[1]) != 0) { + free(shellErrFlag); + shellErrFlag = NULL; + } + if (shellErrFlag == NULL) { + size_t n = strlen(shell->errFlag) + 2; + + shellErrFlag = bmake_malloc(n); + if (shellErrFlag != NULL) + snprintf(shellErrFlag, n, "-%s", + shell->errFlag); + } + } else if (shellErrFlag != NULL) { + free(shellErrFlag); + shellErrFlag = NULL; + } +} + +/* + * Return the string literal that is used in the current command shell + * to produce a newline character. + */ const char * Shell_GetNewline(void) { - return commandShell->newline; + return shell->newline; } void Job_SetPrefix(void) { - if (targPrefix) { - free(targPrefix); - } else if (!Var_Exists(MAKE_JOB_PREFIX, VAR_GLOBAL)) { - Var_Set(MAKE_JOB_PREFIX, "---", VAR_GLOBAL); - } + if (targPrefix != NULL) { + free(targPrefix); + } else if (!Var_Exists(MAKE_JOB_PREFIX, VAR_GLOBAL)) { + Var_Set(MAKE_JOB_PREFIX, "---", VAR_GLOBAL); + } + + (void)Var_Subst("${" MAKE_JOB_PREFIX "}", + VAR_GLOBAL, VARE_WANTRES, &targPrefix); + /* TODO: handle errors */ +} - (void)Var_Subst("${" MAKE_JOB_PREFIX "}", - VAR_GLOBAL, VARE_WANTRES, &targPrefix); - /* TODO: handle errors */ +static void +AddSig(int sig, SignalProc handler) +{ + if (bmake_signal(sig, SIG_IGN) != SIG_IGN) { + sigaddset(&caught_signals, sig); + (void)bmake_signal(sig, handler); + } } /* Initialize the process module. */ void Job_Init(void) { - Job_SetPrefix(); - /* Allocate space for all the job info */ - job_table = bmake_malloc((size_t)opts.maxJobs * sizeof *job_table); - memset(job_table, 0, (size_t)opts.maxJobs * sizeof *job_table); - job_table_end = job_table + opts.maxJobs; - wantToken = 0; - - aborting = ABORT_NONE; - errors = 0; - - lastNode = NULL; - - /* - * There is a non-zero chance that we already have children. - * eg after 'make -f- < 0) - continue; - if (rval == 0) - lurking_children = TRUE; - break; - } + Job_SetPrefix(); + /* Allocate space for all the job info */ + job_table = bmake_malloc((size_t)opts.maxJobs * sizeof *job_table); + memset(job_table, 0, (size_t)opts.maxJobs * sizeof *job_table); + job_table_end = job_table + opts.maxJobs; + wantToken = 0; - Shell_Init(); + aborting = ABORT_NONE; + job_errors = 0; - JobCreatePipe(&childExitJob, 3); + /* + * There is a non-zero chance that we already have children. + * eg after 'make -f- < 0) + continue; + if (rval == 0) + lurking_children = TRUE; + break; + } - /* Preallocate enough for the maximum number of jobs. */ - fds = bmake_malloc(sizeof *fds * - (npseudojobs + (size_t)opts.maxJobs) * nfds_per_job()); - jobfds = bmake_malloc(sizeof *jobfds * - (npseudojobs + (size_t)opts.maxJobs) * nfds_per_job()); + Shell_Init(); - /* These are permanent entries and take slots 0 and 1 */ - watchfd(&tokenWaitJob); - watchfd(&childExitJob); + JobCreatePipe(&childExitJob, 3); - sigemptyset(&caught_signals); - /* - * Install a SIGCHLD handler. - */ - (void)bmake_signal(SIGCHLD, JobChildSig); - sigaddset(&caught_signals, SIGCHLD); + /* Preallocate enough for the maximum number of jobs. */ + fds = bmake_malloc(sizeof *fds * + (npseudojobs + (size_t)opts.maxJobs) * + nfds_per_job()); + allJobs = bmake_malloc(sizeof *allJobs * + (npseudojobs + (size_t)opts.maxJobs) * + nfds_per_job()); -#define ADDSIG(s,h) \ - if (bmake_signal(s, SIG_IGN) != SIG_IGN) { \ - sigaddset(&caught_signals, s); \ - (void)bmake_signal(s, h); \ - } + /* These are permanent entries and take slots 0 and 1 */ + watchfd(&tokenWaitJob); + watchfd(&childExitJob); - /* - * Catch the four signals that POSIX specifies if they aren't ignored. - * JobPassSig will take care of calling JobInterrupt if appropriate. - */ - ADDSIG(SIGINT, JobPassSig_int) - ADDSIG(SIGHUP, JobPassSig_term) - ADDSIG(SIGTERM, JobPassSig_term) - ADDSIG(SIGQUIT, JobPassSig_term) + sigemptyset(&caught_signals); + /* + * Install a SIGCHLD handler. + */ + (void)bmake_signal(SIGCHLD, JobChildSig); + sigaddset(&caught_signals, SIGCHLD); - /* - * There are additional signals that need to be caught and passed if - * either the export system wants to be told directly of signals or if - * we're giving each job its own process group (since then it won't get - * signals from the terminal driver as we own the terminal) - */ - ADDSIG(SIGTSTP, JobPassSig_suspend) - ADDSIG(SIGTTOU, JobPassSig_suspend) - ADDSIG(SIGTTIN, JobPassSig_suspend) - ADDSIG(SIGWINCH, JobCondPassSig) - ADDSIG(SIGCONT, JobContinueSig) -#undef ADDSIG + /* + * Catch the four signals that POSIX specifies if they aren't ignored. + * JobPassSig will take care of calling JobInterrupt if appropriate. + */ + AddSig(SIGINT, JobPassSig_int); + AddSig(SIGHUP, JobPassSig_term); + AddSig(SIGTERM, JobPassSig_term); + AddSig(SIGQUIT, JobPassSig_term); - (void)Job_RunTarget(".BEGIN", NULL); - /* Create the .END node now, even though no code in the unit tests - * depends on it. See also Targ_GetEndNode in Compat_Run. */ - (void)Targ_GetEndNode(); + /* + * There are additional signals that need to be caught and passed if + * either the export system wants to be told directly of signals or if + * we're giving each job its own process group (since then it won't get + * signals from the terminal driver as we own the terminal) + */ + AddSig(SIGTSTP, JobPassSig_suspend); + AddSig(SIGTTOU, JobPassSig_suspend); + AddSig(SIGTTIN, JobPassSig_suspend); + AddSig(SIGWINCH, JobCondPassSig); + AddSig(SIGCONT, JobContinueSig); + + (void)Job_RunTarget(".BEGIN", NULL); + /* Create the .END node now, even though no code in the unit tests + * depends on it. See also Targ_GetEndNode in Compat_Run. */ + (void)Targ_GetEndNode(); } -static void JobSigReset(void) +static void +DelSig(int sig) { -#define DELSIG(s) \ - if (sigismember(&caught_signals, s)) { \ - (void)bmake_signal(s, SIG_DFL); \ - } + if (sigismember(&caught_signals, sig) != 0) + (void)bmake_signal(sig, SIG_DFL); +} - DELSIG(SIGINT) - DELSIG(SIGHUP) - DELSIG(SIGQUIT) - DELSIG(SIGTERM) - DELSIG(SIGTSTP) - DELSIG(SIGTTOU) - DELSIG(SIGTTIN) - DELSIG(SIGWINCH) - DELSIG(SIGCONT) -#undef DELSIG - (void)bmake_signal(SIGCHLD, SIG_DFL); +static void +JobSigReset(void) +{ + DelSig(SIGINT); + DelSig(SIGHUP); + DelSig(SIGQUIT); + DelSig(SIGTERM); + DelSig(SIGTSTP); + DelSig(SIGTTOU); + DelSig(SIGTTIN); + DelSig(SIGWINCH); + DelSig(SIGCONT); + (void)bmake_signal(SIGCHLD, SIG_DFL); } /* Find a shell in 'shells' given its name, or return NULL. */ static Shell * FindShellByName(const char *name) { - Shell *sh = shells; - const Shell *shellsEnd = sh + sizeof shells / sizeof shells[0]; + Shell *sh = shells; + const Shell *shellsEnd = sh + sizeof shells / sizeof shells[0]; - for (sh = shells; sh < shellsEnd; sh++) { - if (strcmp(name, sh->name) == 0) - return sh; - } - return NULL; + for (sh = shells; sh < shellsEnd; sh++) { + if (strcmp(name, sh->name) == 0) + return sh; + } + return NULL; } -/*- - *----------------------------------------------------------------------- - * Job_ParseShell -- - * Parse a shell specification and set up commandShell, shellPath - * and shellName appropriately. +/* + * Parse a shell specification and set up 'shell', shellPath and + * shellName appropriately. * * Input: * line The shell spec * * Results: * FALSE if the specification was incorrect. * * Side Effects: - * commandShell points to a Shell structure (either predefined or + * 'shell' points to a Shell structure (either predefined or * created from the shell spec), shellPath is the full path of the - * shell described by commandShell, while shellName is just the + * shell described by 'shell', while shellName is just the * final component of shellPath. * * Notes: * A shell specification consists of a .SHELL target, with dependency * operator, followed by a series of blank-separated words. Double * quotes can be used to use blanks in words. A backslash escapes * anything (most notably a double-quote and a space) and * provides the functionality it does in C. Each word consists of * keyword and value separated by an equal sign. There should be no * unnecessary spaces in the word. The keywords are as follows: * name Name of shell. * path Location of shell. * quiet Command to turn off echoing. * echo Command to turn echoing on * filter Result of turning off echoing that shouldn't be * printed. * echoFlag Flag to turn echoing on at the start * errFlag Flag to turn error checking on at the start * hasErrCtl True if shell has error checking control * newline String literal to represent a newline char * check Command to turn on error checking if hasErrCtl * is TRUE or template of command to echo a command * for which error checking is off if hasErrCtl is * FALSE. * ignore Command to turn off error checking if hasErrCtl * is TRUE or template of command to execute a * command so as to ignore any errors it returns if * hasErrCtl is FALSE. - * - *----------------------------------------------------------------------- */ Boolean Job_ParseShell(char *line) { - Words wordsList; - char **words; - char **argv; - size_t argc; - char *path; - Shell newShell; - Boolean fullSpec = FALSE; - Shell *sh; - - pp_skip_whitespace(&line); + Words wordsList; + char **words; + char **argv; + size_t argc; + char *path; + Shell newShell; + Boolean fullSpec = FALSE; + Shell *sh; - free(shellArgv); + /* XXX: don't use line as an iterator variable */ + pp_skip_whitespace(&line); - memset(&newShell, 0, sizeof newShell); + free(shellArgv); - /* - * Parse the specification by keyword - */ - wordsList = Str_Words(line, TRUE); - words = wordsList.words; - argc = wordsList.len; - path = wordsList.freeIt; - if (words == NULL) { - Error("Unterminated quoted string [%s]", line); - return FALSE; - } - shellArgv = path; - - for (path = NULL, argv = words; argc != 0; argc--, argv++) { - char *arg = *argv; - if (strncmp(arg, "path=", 5) == 0) { - path = arg + 5; - } else if (strncmp(arg, "name=", 5) == 0) { - newShell.name = arg + 5; - } else { - if (strncmp(arg, "quiet=", 6) == 0) { - newShell.echoOff = arg + 6; - } else if (strncmp(arg, "echo=", 5) == 0) { - newShell.echoOn = arg + 5; - } else if (strncmp(arg, "filter=", 7) == 0) { - newShell.noPrint = arg + 7; - newShell.noPrintLen = strlen(newShell.noPrint); - } else if (strncmp(arg, "echoFlag=", 9) == 0) { - newShell.echo = arg + 9; - } else if (strncmp(arg, "errFlag=", 8) == 0) { - newShell.exit = arg + 8; - } else if (strncmp(arg, "hasErrCtl=", 10) == 0) { - char c = arg[10]; - newShell.hasErrCtl = c == 'Y' || c == 'y' || - c == 'T' || c == 't'; - } else if (strncmp(arg, "newline=", 8) == 0) { - newShell.newline = arg + 8; - } else if (strncmp(arg, "check=", 6) == 0) { - newShell.errOnOrEcho = arg + 6; - } else if (strncmp(arg, "ignore=", 7) == 0) { - newShell.errOffOrExecIgnore = arg + 7; - } else if (strncmp(arg, "errout=", 7) == 0) { - newShell.errExit = arg + 7; - } else if (strncmp(arg, "comment=", 8) == 0) { - newShell.commentChar = arg[8]; - } else { - Parse_Error(PARSE_FATAL, "Unknown keyword \"%s\"", arg); - free(words); - return FALSE; - } - fullSpec = TRUE; - } - } + memset(&newShell, 0, sizeof newShell); - if (path == NULL) { /* - * If no path was given, the user wants one of the pre-defined shells, - * yes? So we find the one s/he wants with the help of FindShellByName - * and set things up the right way. shellPath will be set up by - * Shell_Init. + * Parse the specification by keyword */ - if (newShell.name == NULL) { - Parse_Error(PARSE_FATAL, "Neither path nor name specified"); - free(words); - return FALSE; - } else { - if ((sh = FindShellByName(newShell.name)) == NULL) { - Parse_Error(PARSE_WARNING, "%s: No matching shell", - newShell.name); - free(words); - return FALSE; - } - commandShell = sh; - shellName = newShell.name; - if (shellPath) { - /* Shell_Init has already been called! Do it again. */ - free(UNCONST(shellPath)); - shellPath = NULL; - Shell_Init(); - } + wordsList = Str_Words(line, TRUE); + words = wordsList.words; + argc = wordsList.len; + path = wordsList.freeIt; + if (words == NULL) { + Error("Unterminated quoted string [%s]", line); + return FALSE; } - } else { - /* - * The user provided a path. If s/he gave nothing else (fullSpec is - * FALSE), try and find a matching shell in the ones we know of. - * Else we just take the specification at its word and copy it - * to a new location. In either case, we need to record the - * path the user gave for the shell. - */ - shellPath = path; - path = strrchr(path, '/'); - if (path == NULL) { - path = UNCONST(shellPath); - } else { - path++; + shellArgv = path; + + for (path = NULL, argv = words; argc != 0; argc--, argv++) { + char *arg = *argv; + if (strncmp(arg, "path=", 5) == 0) { + path = arg + 5; + } else if (strncmp(arg, "name=", 5) == 0) { + newShell.name = arg + 5; + } else { + if (strncmp(arg, "quiet=", 6) == 0) { + newShell.echoOff = arg + 6; + } else if (strncmp(arg, "echo=", 5) == 0) { + newShell.echoOn = arg + 5; + } else if (strncmp(arg, "filter=", 7) == 0) { + newShell.noPrint = arg + 7; + newShell.noPrintLen = strlen(newShell.noPrint); + } else if (strncmp(arg, "echoFlag=", 9) == 0) { + newShell.echoFlag = arg + 9; + } else if (strncmp(arg, "errFlag=", 8) == 0) { + newShell.errFlag = arg + 8; + } else if (strncmp(arg, "hasErrCtl=", 10) == 0) { + char c = arg[10]; + newShell.hasErrCtl = c == 'Y' || c == 'y' || + c == 'T' || c == 't'; + } else if (strncmp(arg, "newline=", 8) == 0) { + newShell.newline = arg + 8; + } else if (strncmp(arg, "check=", 6) == 0) { + /* Before 2020-12-10, these two variables + * had been a single variable. */ + newShell.errOn = arg + 6; + newShell.echoTmpl = arg + 6; + } else if (strncmp(arg, "ignore=", 7) == 0) { + /* Before 2020-12-10, these two variables + * had been a single variable. */ + newShell.errOff = arg + 7; + newShell.runIgnTmpl = arg + 7; + } else if (strncmp(arg, "errout=", 7) == 0) { + newShell.runChkTmpl = arg + 7; + } else if (strncmp(arg, "comment=", 8) == 0) { + newShell.commentChar = arg[8]; + } else { + Parse_Error(PARSE_FATAL, + "Unknown keyword \"%s\"", arg); + free(words); + return FALSE; + } + fullSpec = TRUE; + } } - if (newShell.name != NULL) { - shellName = newShell.name; - } else { - shellName = path; - } - if (!fullSpec) { - if ((sh = FindShellByName(shellName)) == NULL) { - Parse_Error(PARSE_WARNING, "%s: No matching shell", - shellName); - free(words); - return FALSE; - } - commandShell = sh; + + if (path == NULL) { + /* + * If no path was given, the user wants one of the + * pre-defined shells, yes? So we find the one s/he wants + * with the help of FindShellByName and set things up the + * right way. shellPath will be set up by Shell_Init. + */ + if (newShell.name == NULL) { + Parse_Error(PARSE_FATAL, + "Neither path nor name specified"); + free(words); + return FALSE; + } else { + if ((sh = FindShellByName(newShell.name)) == NULL) { + Parse_Error(PARSE_WARNING, + "%s: No matching shell", newShell.name); + free(words); + return FALSE; + } + shell = sh; + shellName = newShell.name; + if (shellPath != NULL) { + /* + * Shell_Init has already been called! + * Do it again. + */ + free(UNCONST(shellPath)); + shellPath = NULL; + Shell_Init(); + } + } } else { - commandShell = bmake_malloc(sizeof *commandShell); - *commandShell = newShell; + /* + * The user provided a path. If s/he gave nothing else + * (fullSpec is FALSE), try and find a matching shell in the + * ones we know of. Else we just take the specification at + * its word and copy it to a new location. In either case, + * we need to record the path the user gave for the shell. + */ + shellPath = path; + path = strrchr(path, '/'); + if (path == NULL) { + path = UNCONST(shellPath); + } else { + path++; + } + if (newShell.name != NULL) { + shellName = newShell.name; + } else { + shellName = path; + } + if (!fullSpec) { + if ((sh = FindShellByName(shellName)) == NULL) { + Parse_Error(PARSE_WARNING, + "%s: No matching shell", shellName); + free(words); + return FALSE; + } + shell = sh; + } else { + shell = bmake_malloc(sizeof *shell); + *shell = newShell; + } + /* this will take care of shellErrFlag */ + Shell_Init(); } - /* this will take care of shellErrFlag */ - Shell_Init(); - } - if (commandShell->echoOn && commandShell->echoOff) { - commandShell->hasEchoCtl = TRUE; - } + if (shell->echoOn != NULL && shell->echoOff != NULL) + shell->hasEchoCtl = TRUE; - if (!commandShell->hasErrCtl) { - if (commandShell->errOnOrEcho == NULL) { - commandShell->errOnOrEcho = ""; + if (!shell->hasErrCtl) { + if (shell->echoTmpl == NULL) + shell->echoTmpl = ""; + if (shell->runIgnTmpl == NULL) + shell->runIgnTmpl = "%s\n"; } - if (commandShell->errOffOrExecIgnore == NULL) { - commandShell->errOffOrExecIgnore = "%s\n"; - } - } - /* - * Do not free up the words themselves, since they might be in use by the - * shell specification. - */ - free(words); - return TRUE; + /* + * Do not free up the words themselves, since they might be in use + * by the shell specification. + */ + free(words); + return TRUE; } -/* Handle the receipt of an interrupt. +/* + * Handle the receipt of an interrupt. * * All children are killed. Another job will be started if the .INTERRUPT * target is defined. * * Input: * runINTERRUPT Non-zero if commands for the .INTERRUPT target * should be executed * signo signal received */ static void -JobInterrupt(int runINTERRUPT, int signo) +JobInterrupt(Boolean runINTERRUPT, int signo) { - Job *job; /* job descriptor in that element */ - GNode *interrupt; /* the node describing the .INTERRUPT target */ - sigset_t mask; - GNode *gn; + Job *job; /* job descriptor in that element */ + GNode *interrupt; /* the node describing the .INTERRUPT target */ + sigset_t mask; + GNode *gn; - aborting = ABORT_INTERRUPT; + aborting = ABORT_INTERRUPT; - JobSigLock(&mask); + JobSigLock(&mask); - for (job = job_table; job < job_table_end; job++) { - if (job->status != JOB_ST_RUNNING) - continue; + for (job = job_table; job < job_table_end; job++) { + if (job->status != JOB_ST_RUNNING) + continue; - gn = job->node; + gn = job->node; - JobDeleteTarget(gn); - if (job->pid) { - DEBUG2(JOB, "JobInterrupt passing signal %d to child %d.\n", - signo, job->pid); - KILLPG(job->pid, signo); + JobDeleteTarget(gn); + if (job->pid != 0) { + DEBUG2(JOB, + "JobInterrupt passing signal %d to child %d.\n", + signo, job->pid); + KILLPG(job->pid, signo); + } } - } - JobSigUnlock(&mask); + JobSigUnlock(&mask); - if (runINTERRUPT && !opts.touchFlag) { - interrupt = Targ_FindNode(".INTERRUPT"); - if (interrupt != NULL) { - opts.ignoreErrors = FALSE; - JobRun(interrupt); + if (runINTERRUPT && !opts.touchFlag) { + interrupt = Targ_FindNode(".INTERRUPT"); + if (interrupt != NULL) { + opts.ignoreErrors = FALSE; + JobRun(interrupt); + } } - } - Trace_Log(MAKEINTR, NULL); - exit(signo); + Trace_Log(MAKEINTR, NULL); + exit(signo); /* XXX: why signo? */ } -/* Do the final processing, i.e. run the commands attached to the .END target. +/* + * Do the final processing, i.e. run the commands attached to the .END target. * - * Return the number of errors reported. */ + * Return the number of errors reported. + */ int Job_Finish(void) { - GNode *endNode = Targ_GetEndNode(); - if (!Lst_IsEmpty(endNode->commands) || !Lst_IsEmpty(endNode->children)) { - if (errors) { - Error("Errors reported so .END ignored"); - } else { - JobRun(endNode); + GNode *endNode = Targ_GetEndNode(); + if (!Lst_IsEmpty(&endNode->commands) || + !Lst_IsEmpty(&endNode->children)) { + if (job_errors != 0) { + Error("Errors reported so .END ignored"); + } else { + JobRun(endNode); + } } - } - return errors; + return job_errors; } /* Clean up any memory used by the jobs module. */ void Job_End(void) { #ifdef CLEANUP - free(shellArgv); + free(shellArgv); #endif } -/* Waits for all running jobs to finish and returns. - * Sets 'aborting' to ABORT_WAIT to prevent other jobs from starting. */ +/* + * Waits for all running jobs to finish and returns. + * Sets 'aborting' to ABORT_WAIT to prevent other jobs from starting. + */ void Job_Wait(void) { - aborting = ABORT_WAIT; - while (jobTokensRunning != 0) { - Job_CatchOutput(); - } - aborting = ABORT_NONE; + aborting = ABORT_WAIT; + while (jobTokensRunning != 0) { + Job_CatchOutput(); + } + aborting = ABORT_NONE; } -/* Abort all currently running jobs without handling output or anything. +/* + * Abort all currently running jobs without handling output or anything. * This function is to be called only in the event of a major error. * Most definitely NOT to be called from JobInterrupt. * - * All children are killed, not just the firstborn. */ + * All children are killed, not just the firstborn. + */ void Job_AbortAll(void) { - Job *job; /* the job descriptor in that element */ - WAIT_T foo; - - aborting = ABORT_ERROR; - - if (jobTokensRunning) { - for (job = job_table; job < job_table_end; job++) { - if (job->status != JOB_ST_RUNNING) - continue; - /* - * kill the child process with increasingly drastic signals to make - * darn sure it's dead. - */ - KILLPG(job->pid, SIGINT); - KILLPG(job->pid, SIGKILL); + Job *job; /* the job descriptor in that element */ + WAIT_T foo; + + aborting = ABORT_ERROR; + + if (jobTokensRunning != 0) { + for (job = job_table; job < job_table_end; job++) { + if (job->status != JOB_ST_RUNNING) + continue; + /* + * kill the child process with increasingly drastic + * signals to make darn sure it's dead. + */ + KILLPG(job->pid, SIGINT); + KILLPG(job->pid, SIGKILL); + } } - } - /* - * Catch as many children as want to report in at first, then give up - */ - while (waitpid((pid_t) -1, &foo, WNOHANG) > 0) - continue; + /* + * Catch as many children as want to report in at first, then give up + */ + while (waitpid((pid_t)-1, &foo, WNOHANG) > 0) + continue; } -/* Tries to restart stopped jobs if there are slots available. - * Called in process context in response to a SIGCONT. */ +/* + * Tries to restart stopped jobs if there are slots available. + * Called in process context in response to a SIGCONT. + */ static void JobRestartJobs(void) { - Job *job; - - for (job = job_table; job < job_table_end; job++) { - if (job->status == JOB_ST_RUNNING && - (make_suspended || job->suspended)) { - DEBUG1(JOB, "Restarting stopped job pid %d.\n", job->pid); - if (job->suspended) { - (void)printf("*** [%s] Continued\n", job->node->name); - (void)fflush(stdout); - } - job->suspended = FALSE; - if (KILLPG(job->pid, SIGCONT) != 0 && DEBUG(JOB)) { - debug_printf("Failed to send SIGCONT to %d\n", job->pid); - } - } - if (job->status == JOB_ST_FINISHED) - /* Job exit deferred after calling waitpid() in a signal handler */ - JobFinish(job, job->exit_status); - } - make_suspended = FALSE; + Job *job; + + for (job = job_table; job < job_table_end; job++) { + if (job->status == JOB_ST_RUNNING && + (make_suspended || job->suspended)) { + DEBUG1(JOB, "Restarting stopped job pid %d.\n", + job->pid); + if (job->suspended) { + (void)printf("*** [%s] Continued\n", + job->node->name); + (void)fflush(stdout); + } + job->suspended = FALSE; + if (KILLPG(job->pid, SIGCONT) != 0 && DEBUG(JOB)) { + debug_printf("Failed to send SIGCONT to %d\n", + job->pid); + } + } + if (job->status == JOB_ST_FINISHED) { + /* + * Job exit deferred after calling waitpid() in a + * signal handler + */ + JobFinish(job, job->exit_status); + } + } + make_suspended = FALSE; } static void watchfd(Job *job) { - if (job->inPollfd != NULL) - Punt("Watching watched job"); - - fds[nfds].fd = job->inPipe; - fds[nfds].events = POLLIN; - jobfds[nfds] = job; - job->inPollfd = &fds[nfds]; - nfds++; + if (job->inPollfd != NULL) + Punt("Watching watched job"); + + fds[nJobs].fd = job->inPipe; + fds[nJobs].events = POLLIN; + allJobs[nJobs] = job; + job->inPollfd = &fds[nJobs]; + nJobs++; #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) - if (useMeta) { - fds[nfds].fd = meta_job_fd(job); - fds[nfds].events = fds[nfds].fd == -1 ? 0 : POLLIN; - jobfds[nfds] = job; - nfds++; - } + if (useMeta) { + fds[nJobs].fd = meta_job_fd(job); + fds[nJobs].events = fds[nJobs].fd == -1 ? 0 : POLLIN; + allJobs[nJobs] = job; + nJobs++; + } #endif } static void clearfd(Job *job) { - size_t i; - if (job->inPollfd == NULL) - Punt("Unwatching unwatched job"); - i = (size_t)(job->inPollfd - fds); - nfds--; + size_t i; + if (job->inPollfd == NULL) + Punt("Unwatching unwatched job"); + i = (size_t)(job->inPollfd - fds); + nJobs--; #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) - if (useMeta) { + if (useMeta) { + /* + * Sanity check: there should be two fds per job, so the job's + * pollfd number should be even. + */ + assert(nfds_per_job() == 2); + if (i % 2 != 0) + Punt("odd-numbered fd with meta"); + nJobs--; + } +#endif /* - * Sanity check: there should be two fds per job, so the job's - * pollfd number should be even. + * Move last job in table into hole made by dead job. */ - assert(nfds_per_job() == 2); - if (i % 2) - Punt("odd-numbered fd with meta"); - nfds--; - } -#endif - /* - * Move last job in table into hole made by dead job. - */ - if (nfds != i) { - fds[i] = fds[nfds]; - jobfds[i] = jobfds[nfds]; - jobfds[i]->inPollfd = &fds[i]; + if (nJobs != i) { + fds[i] = fds[nJobs]; + allJobs[i] = allJobs[nJobs]; + allJobs[i]->inPollfd = &fds[i]; #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) - if (useMeta) { - fds[i + 1] = fds[nfds + 1]; - jobfds[i + 1] = jobfds[nfds + 1]; - } + if (useMeta) { + fds[i + 1] = fds[nJobs + 1]; + allJobs[i + 1] = allJobs[nJobs + 1]; + } #endif - } - job->inPollfd = NULL; + } + job->inPollfd = NULL; } -static int +static Boolean readyfd(Job *job) { - if (job->inPollfd == NULL) - Punt("Polling unwatched job"); - return (job->inPollfd->revents & POLLIN) != 0; + if (job->inPollfd == NULL) + Punt("Polling unwatched job"); + return (job->inPollfd->revents & POLLIN) != 0; } -/* Put a token (back) into the job pipe. - * This allows a make process to start a build job. */ +/* + * Put a token (back) into the job pipe. + * This allows a make process to start a build job. + */ static void JobTokenAdd(void) { - char tok = JOB_TOKENS[aborting], tok1; + char tok = JOB_TOKENS[aborting], tok1; - /* If we are depositing an error token flush everything else */ - while (tok != '+' && read(tokenWaitJob.inPipe, &tok1, 1) == 1) - continue; + /* If we are depositing an error token flush everything else */ + while (tok != '+' && read(tokenWaitJob.inPipe, &tok1, 1) == 1) + continue; - DEBUG3(JOB, "(%d) aborting %d, deposit token %c\n", - getpid(), aborting, tok); - while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN) - continue; + DEBUG3(JOB, "(%d) aborting %d, deposit token %c\n", + getpid(), aborting, tok); + while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN) + continue; } /* Prep the job token pipe in the root make process. */ void Job_ServerStart(int max_tokens, int jp_0, int jp_1) { - int i; - char jobarg[64]; - - if (jp_0 >= 0 && jp_1 >= 0) { - /* Pipe passed in from parent */ - tokenWaitJob.inPipe = jp_0; - tokenWaitJob.outPipe = jp_1; - (void)fcntl(jp_0, F_SETFD, FD_CLOEXEC); - (void)fcntl(jp_1, F_SETFD, FD_CLOEXEC); - return; - } + int i; + char jobarg[64]; + + if (jp_0 >= 0 && jp_1 >= 0) { + /* Pipe passed in from parent */ + tokenWaitJob.inPipe = jp_0; + tokenWaitJob.outPipe = jp_1; + (void)fcntl(jp_0, F_SETFD, FD_CLOEXEC); + (void)fcntl(jp_1, F_SETFD, FD_CLOEXEC); + return; + } - JobCreatePipe(&tokenWaitJob, 15); + JobCreatePipe(&tokenWaitJob, 15); - snprintf(jobarg, sizeof jobarg, "%d,%d", + snprintf(jobarg, sizeof jobarg, "%d,%d", tokenWaitJob.inPipe, tokenWaitJob.outPipe); - Var_Append(MAKEFLAGS, "-J", VAR_GLOBAL); - Var_Append(MAKEFLAGS, jobarg, VAR_GLOBAL); + Var_Append(MAKEFLAGS, "-J", VAR_GLOBAL); + Var_Append(MAKEFLAGS, jobarg, VAR_GLOBAL); - /* - * Preload the job pipe with one token per job, save the one - * "extra" token for the primary job. - * - * XXX should clip maxJobs against PIPE_BUF -- if max_tokens is - * larger than the write buffer size of the pipe, we will - * deadlock here. - */ - for (i = 1; i < max_tokens; i++) - JobTokenAdd(); + /* + * Preload the job pipe with one token per job, save the one + * "extra" token for the primary job. + * + * XXX should clip maxJobs against PIPE_BUF -- if max_tokens is + * larger than the write buffer size of the pipe, we will + * deadlock here. + */ + for (i = 1; i < max_tokens; i++) + JobTokenAdd(); } /* Return a withdrawn token to the pool. */ void Job_TokenReturn(void) { - jobTokensRunning--; - if (jobTokensRunning < 0) - Punt("token botch"); - if (jobTokensRunning || JOB_TOKENS[aborting] != '+') - JobTokenAdd(); + jobTokensRunning--; + if (jobTokensRunning < 0) + Punt("token botch"); + if (jobTokensRunning != 0 || JOB_TOKENS[aborting] != '+') + JobTokenAdd(); } -/* Attempt to withdraw a token from the pool. +/* + * Attempt to withdraw a token from the pool. * * If pool is empty, set wantToken so that we wake up when a token is * released. * * Returns TRUE if a token was withdrawn, and FALSE if the pool is currently - * empty. */ + * empty. + */ Boolean Job_TokenWithdraw(void) { - char tok, tok1; - ssize_t count; + char tok, tok1; + ssize_t count; - wantToken = 0; - DEBUG3(JOB, "Job_TokenWithdraw(%d): aborting %d, running %d\n", - getpid(), aborting, jobTokensRunning); + wantToken = 0; + DEBUG3(JOB, "Job_TokenWithdraw(%d): aborting %d, running %d\n", + getpid(), aborting, jobTokensRunning); - if (aborting != ABORT_NONE || (jobTokensRunning >= opts.maxJobs)) - return FALSE; + if (aborting != ABORT_NONE || (jobTokensRunning >= opts.maxJobs)) + return FALSE; - count = read(tokenWaitJob.inPipe, &tok, 1); - if (count == 0) - Fatal("eof on job pipe!"); - if (count < 0 && jobTokensRunning != 0) { - if (errno != EAGAIN) { - Fatal("job pipe read: %s", strerror(errno)); + count = read(tokenWaitJob.inPipe, &tok, 1); + if (count == 0) + Fatal("eof on job pipe!"); + if (count < 0 && jobTokensRunning != 0) { + if (errno != EAGAIN) { + Fatal("job pipe read: %s", strerror(errno)); + } + DEBUG1(JOB, "(%d) blocked for token\n", getpid()); + wantToken = 1; + return FALSE; } - DEBUG1(JOB, "(%d) blocked for token\n", getpid()); - return FALSE; - } - if (count == 1 && tok != '+') { - /* make being abvorted - remove any other job tokens */ - DEBUG2(JOB, "(%d) aborted by token %c\n", getpid(), tok); - while (read(tokenWaitJob.inPipe, &tok1, 1) == 1) - continue; - /* And put the stopper back */ - while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN) - continue; - if (shouldDieQuietly(NULL, 1)) - exit(2); - Fatal("A failure has been detected in another branch of the parallel make"); - } + if (count == 1 && tok != '+') { + /* make being aborted - remove any other job tokens */ + DEBUG2(JOB, "(%d) aborted by token %c\n", getpid(), tok); + while (read(tokenWaitJob.inPipe, &tok1, 1) == 1) + continue; + /* And put the stopper back */ + while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && + errno == EAGAIN) + continue; + if (shouldDieQuietly(NULL, 1)) + exit(6); /* we aborted */ + Fatal("A failure has been detected " + "in another branch of the parallel make"); + } - if (count == 1 && jobTokensRunning == 0) - /* We didn't want the token really */ - while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && errno == EAGAIN) - continue; + if (count == 1 && jobTokensRunning == 0) + /* We didn't want the token really */ + while (write(tokenWaitJob.outPipe, &tok, 1) == -1 && + errno == EAGAIN) + continue; - jobTokensRunning++; - DEBUG1(JOB, "(%d) withdrew token\n", getpid()); - return TRUE; + jobTokensRunning++; + DEBUG1(JOB, "(%d) withdrew token\n", getpid()); + return TRUE; } -/* Run the named target if found. If a filename is specified, then set that +/* + * Run the named target if found. If a filename is specified, then set that * to the sources. * - * Exits if the target fails. */ + * Exits if the target fails. + */ Boolean -Job_RunTarget(const char *target, const char *fname) { - GNode *gn = Targ_FindNode(target); - if (gn == NULL) - return FALSE; +Job_RunTarget(const char *target, const char *fname) +{ + GNode *gn = Targ_FindNode(target); + if (gn == NULL) + return FALSE; - if (fname) - Var_Set(ALLSRC, fname, gn); + if (fname != NULL) + Var_Set(ALLSRC, fname, gn); - JobRun(gn); - if (gn->made == ERROR) { - PrintOnError(gn, "\n\nStop."); - exit(1); - } - return TRUE; + JobRun(gn); + /* XXX: Replace with GNode_IsError(gn) */ + if (gn->made == ERROR) { + PrintOnError(gn, "\n\nStop."); + exit(1); + } + return TRUE; } #ifdef USE_SELECT int emul_poll(struct pollfd *fd, int nfd, int timeout) { - fd_set rfds, wfds; - int i, maxfd, nselect, npoll; - struct timeval tv, *tvp; - long usecs; + fd_set rfds, wfds; + int i, maxfd, nselect, npoll; + struct timeval tv, *tvp; + long usecs; - FD_ZERO(&rfds); - FD_ZERO(&wfds); + FD_ZERO(&rfds); + FD_ZERO(&wfds); - maxfd = -1; - for (i = 0; i < nfd; i++) { - fd[i].revents = 0; + maxfd = -1; + for (i = 0; i < nfd; i++) { + fd[i].revents = 0; - if (fd[i].events & POLLIN) - FD_SET(fd[i].fd, &rfds); + if (fd[i].events & POLLIN) + FD_SET(fd[i].fd, &rfds); - if (fd[i].events & POLLOUT) - FD_SET(fd[i].fd, &wfds); + if (fd[i].events & POLLOUT) + FD_SET(fd[i].fd, &wfds); - if (fd[i].fd > maxfd) - maxfd = fd[i].fd; - } + if (fd[i].fd > maxfd) + maxfd = fd[i].fd; + } - if (maxfd >= FD_SETSIZE) { - Punt("Ran out of fd_set slots; " - "recompile with a larger FD_SETSIZE."); - } + if (maxfd >= FD_SETSIZE) { + Punt("Ran out of fd_set slots; " + "recompile with a larger FD_SETSIZE."); + } - if (timeout < 0) { - tvp = NULL; - } else { - usecs = timeout * 1000; - tv.tv_sec = usecs / 1000000; - tv.tv_usec = usecs % 1000000; - tvp = &tv; - } + if (timeout < 0) { + tvp = NULL; + } else { + usecs = timeout * 1000; + tv.tv_sec = usecs / 1000000; + tv.tv_usec = usecs % 1000000; + tvp = &tv; + } - nselect = select(maxfd + 1, &rfds, &wfds, NULL, tvp); + nselect = select(maxfd + 1, &rfds, &wfds, NULL, tvp); - if (nselect <= 0) - return nselect; + if (nselect <= 0) + return nselect; - npoll = 0; - for (i = 0; i < nfd; i++) { - if (FD_ISSET(fd[i].fd, &rfds)) - fd[i].revents |= POLLIN; + npoll = 0; + for (i = 0; i < nfd; i++) { + if (FD_ISSET(fd[i].fd, &rfds)) + fd[i].revents |= POLLIN; - if (FD_ISSET(fd[i].fd, &wfds)) - fd[i].revents |= POLLOUT; + if (FD_ISSET(fd[i].fd, &wfds)) + fd[i].revents |= POLLOUT; - if (fd[i].revents) - npoll++; - } + if (fd[i].revents) + npoll++; + } - return npoll; + return npoll; } #endif /* USE_SELECT */ diff --git a/job.h b/job.h index d48424858201..9bb5f149766f 100644 --- a/job.h +++ b/job.h @@ -1,215 +1,209 @@ -/* $NetBSD: job.h,v 1.63 2020/11/14 13:27:01 rillig Exp $ */ +/* $NetBSD: job.h,v 1.71 2020/12/30 10:03:16 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)job.h 8.1 (Berkeley) 6/6/93 */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)job.h 8.1 (Berkeley) 6/6/93 */ /* * Running of jobs in parallel mode. */ #ifndef MAKE_JOB_H #define MAKE_JOB_H #define TMPPAT "makeXXXXXX" /* relative to tmpdir */ #ifdef USE_SELECT /* * Emulate poll() in terms of select(). This is not a complete * emulation but it is sufficient for make's purposes. */ #define poll emul_poll #define pollfd emul_pollfd struct emul_pollfd { int fd; short events; short revents; }; -#define POLLIN 0x0001 -#define POLLOUT 0x0004 +#define POLLIN 0x0001 +#define POLLOUT 0x0004 int emul_poll(struct pollfd *fd, int nfd, int timeout); #endif /* * The POLL_MSEC constant determines the maximum number of milliseconds spent * in poll before coming out to see if a child has finished. */ #define POLL_MSEC 5000 struct pollfd; #ifdef USE_META # include "meta.h" #endif typedef enum JobStatus { - JOB_ST_FREE = 0, /* Job is available */ - JOB_ST_SET_UP = 1, /* Job is allocated but otherwise invalid */ - /* XXX: What about the 2? */ - JOB_ST_RUNNING = 3, /* Job is running, pid valid */ - JOB_ST_FINISHED = 4 /* Job is done (ie after SIGCHILD) */ + JOB_ST_FREE = 0, /* Job is available */ + JOB_ST_SET_UP = 1, /* Job is allocated but otherwise invalid */ + /* XXX: What about the 2? */ + JOB_ST_RUNNING = 3, /* Job is running, pid valid */ + JOB_ST_FINISHED = 4 /* Job is done (ie after SIGCHILD) */ } JobStatus; -typedef enum JobFlags { - JOB_NONE = 0, - /* Ignore non-zero exits */ - JOB_IGNERR = 1 << 0, - /* no output */ - JOB_SILENT = 1 << 1, - /* Target is a special one. i.e. run it locally - * if we can't export it and maxLocal is 0 */ - JOB_SPECIAL = 1 << 2, - /* we've sent 'set -x' */ - JOB_TRACED = 1 << 10 -} JobFlags; - -/* A Job manages the shell commands that are run to create a single target. +/* + * A Job manages the shell commands that are run to create a single target. * Each job is run in a separate subprocess by a shell. Several jobs can run * in parallel. * * The shell commands for the target are written to a temporary file, * then the shell is run with the temporary file as stdin, and the output * of that shell is captured via a pipe. * * When a job is finished, Make_Update updates all parents of the node * that was just remade, marking them as ready to be made next if all - * other dependencies are finished as well. */ + * other dependencies are finished as well. + */ typedef struct Job { - /* The process ID of the shell running the commands */ - int pid; + /* The process ID of the shell running the commands */ + int pid; - /* The target the child is making */ - GNode *node; + /* The target the child is making */ + GNode *node; - /* If one of the shell commands is "...", all following commands are - * delayed until the .END node is made. This list node points to the - * first of these commands, if any. */ - StringListNode *tailCmds; + /* If one of the shell commands is "...", all following commands are + * delayed until the .END node is made. This list node points to the + * first of these commands, if any. */ + StringListNode *tailCmds; - /* When creating the shell script, this is where the commands go. - * This is only used before the job is actually started. */ - FILE *cmdFILE; + /* This is where the shell commands go. */ + FILE *cmdFILE; - int exit_status; /* from wait4() in signal handler */ + int exit_status; /* from wait4() in signal handler */ - JobStatus status; + JobStatus status; - Boolean suspended; + Boolean suspended; - JobFlags flags; /* Flags to control treatment of job */ + /* Ignore non-zero exits */ + Boolean ignerr; + /* Output the command before or instead of running it. */ + Boolean echo; + /* Target is a special one. */ + Boolean special; - int inPipe; /* Pipe for reading output from job */ - int outPipe; /* Pipe for writing control commands */ - struct pollfd *inPollfd; /* pollfd associated with inPipe */ + int inPipe; /* Pipe for reading output from job */ + int outPipe; /* Pipe for writing control commands */ + struct pollfd *inPollfd; /* pollfd associated with inPipe */ #define JOB_BUFSIZE 1024 - /* Buffer for storing the output of the job, line by line. */ - char outBuf[JOB_BUFSIZE + 1]; - size_t curPos; /* Current position in outBuf. */ + /* Buffer for storing the output of the job, line by line. */ + char outBuf[JOB_BUFSIZE + 1]; + size_t curPos; /* Current position in outBuf. */ #ifdef USE_META - struct BuildMon bm; + struct BuildMon bm; #endif } Job; extern const char *shellPath; extern const char *shellName; extern char *shellErrFlag; extern int jobTokensRunning; /* tokens currently "out" */ void Shell_Init(void); const char *Shell_GetNewline(void); void Job_Touch(GNode *, Boolean); Boolean Job_CheckCommands(GNode *, void (*abortProc)(const char *, ...)); void Job_CatchChildren(void); void Job_CatchOutput(void); void Job_Make(GNode *); void Job_Init(void); Boolean Job_ParseShell(char *); int Job_Finish(void); void Job_End(void); void Job_Wait(void); void Job_AbortAll(void); void Job_TokenReturn(void); Boolean Job_TokenWithdraw(void); void Job_ServerStart(int, int, int); void Job_SetPrefix(void); Boolean Job_RunTarget(const char *, const char *); +void Job_FlagsToString(const Job *, char *, size_t); #endif /* MAKE_JOB_H */ diff --git a/lst.c b/lst.c index 71a0b41c1077..8d660b37ff52 100644 --- a/lst.c +++ b/lst.c @@ -1,311 +1,299 @@ -/* $NetBSD: lst.c,v 1.92 2020/11/08 01:29:26 rillig Exp $ */ +/* $NetBSD: lst.c,v 1.102 2020/12/30 10:03:16 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include "make.h" -MAKE_RCSID("$NetBSD: lst.c,v 1.92 2020/11/08 01:29:26 rillig Exp $"); - -#ifdef HAVE_INTTYPES_H -#include -#elif defined(HAVE_STDINT_H) -#include -#endif +MAKE_RCSID("$NetBSD: lst.c,v 1.102 2020/12/30 10:03:16 rillig Exp $"); static ListNode * LstNodeNew(ListNode *prev, ListNode *next, void *datum) { - ListNode *ln = bmake_malloc(sizeof *ln); - ln->prev = prev; - ln->next = next; - ln->datum = datum; - return ln; + ListNode *ln = bmake_malloc(sizeof *ln); + + ln->prev = prev; + ln->next = next; + ln->datum = datum; + + return ln; } /* Create and initialize a new, empty list. */ List * Lst_New(void) { - List *list = bmake_malloc(sizeof *list); + List *list = bmake_malloc(sizeof *list); + Lst_Init(list); + return list; +} - list->first = NULL; - list->last = NULL; +void +Lst_Done(List *list) +{ + ListNode *ln, *next; + + for (ln = list->first; ln != NULL; ln = next) { + next = ln->next; + free(ln); + } +} + +void +Lst_DoneCall(List *list, LstFreeProc freeProc) +{ + ListNode *ln, *next; - return list; + for (ln = list->first; ln != NULL; ln = next) { + next = ln->next; + freeProc(ln->datum); + free(ln); + } } /* Free a list and all its nodes. The node data are not freed though. */ void Lst_Free(List *list) { - ListNode *ln, *next; - for (ln = list->first; ln != NULL; ln = next) { - next = ln->next; - free(ln); - } - - free(list); + Lst_Done(list); + free(list); } -/* Destroy a list and free all its resources. The freeProc is called with the - * datum from each node in turn before the node is freed. */ +/* + * Destroy a list and free all its resources. The freeProc is called with the + * datum from each node in turn before the node is freed. + */ void Lst_Destroy(List *list, LstFreeProc freeProc) { - ListNode *ln, *next; - - for (ln = list->first; ln != NULL; ln = next) { - next = ln->next; - freeProc(ln->datum); - free(ln); - } - - free(list); + Lst_DoneCall(list, freeProc); + free(list); } /* Insert a new node with the datum before the given node. */ void Lst_InsertBefore(List *list, ListNode *ln, void *datum) { - ListNode *newNode; + ListNode *newNode; - assert(datum != NULL); + assert(datum != NULL); - newNode = LstNodeNew(ln->prev, ln, datum); + newNode = LstNodeNew(ln->prev, ln, datum); - if (ln->prev != NULL) - ln->prev->next = newNode; - ln->prev = newNode; + if (ln->prev != NULL) + ln->prev->next = newNode; + ln->prev = newNode; - if (ln == list->first) - list->first = newNode; + if (ln == list->first) + list->first = newNode; } /* Add a piece of data at the start of the given list. */ void Lst_Prepend(List *list, void *datum) { - ListNode *ln; + ListNode *ln; - assert(datum != NULL); + assert(datum != NULL); - ln = LstNodeNew(NULL, list->first, datum); + ln = LstNodeNew(NULL, list->first, datum); - if (list->first == NULL) { - list->first = ln; - list->last = ln; - } else { - list->first->prev = ln; - list->first = ln; - } + if (list->first == NULL) { + list->first = ln; + list->last = ln; + } else { + list->first->prev = ln; + list->first = ln; + } } /* Add a piece of data at the end of the given list. */ void Lst_Append(List *list, void *datum) { - ListNode *ln; + ListNode *ln; - assert(datum != NULL); + assert(datum != NULL); - ln = LstNodeNew(list->last, NULL, datum); + ln = LstNodeNew(list->last, NULL, datum); - if (list->last == NULL) { - list->first = ln; - list->last = ln; - } else { - list->last->next = ln; - list->last = ln; - } + if (list->last == NULL) { + list->first = ln; + list->last = ln; + } else { + list->last->next = ln; + list->last = ln; + } } -/* Remove the given node from the given list. - * The datum stored in the node must be freed by the caller, if necessary. */ +/* + * Remove the given node from the given list. + * The datum stored in the node must be freed by the caller, if necessary. + */ void Lst_Remove(List *list, ListNode *ln) { - /* unlink it from its neighbors */ - if (ln->next != NULL) - ln->next->prev = ln->prev; - if (ln->prev != NULL) - ln->prev->next = ln->next; - - /* unlink it from the list */ - if (list->first == ln) - list->first = ln->next; - if (list->last == ln) - list->last = ln->prev; + /* unlink it from its neighbors */ + if (ln->next != NULL) + ln->next->prev = ln->prev; + if (ln->prev != NULL) + ln->prev->next = ln->next; + + /* unlink it from the list */ + if (list->first == ln) + list->first = ln->next; + if (list->last == ln) + list->last = ln->prev; } /* Replace the datum in the given node with the new datum. */ void LstNode_Set(ListNode *ln, void *datum) { - assert(datum != NULL); + assert(datum != NULL); - ln->datum = datum; + ln->datum = datum; } -/* Replace the datum in the given node with NULL. - * Having NULL values in a list is unusual though. */ +/* + * Replace the datum in the given node with NULL. + * Having NULL values in a list is unusual though. + */ void LstNode_SetNull(ListNode *ln) { - ln->datum = NULL; + ln->datum = NULL; } -/* Return the first node that contains the given datum, or NULL. +/* + * Return the first node that contains the given datum, or NULL. * - * Time complexity: O(length(list)) */ + * Time complexity: O(length(list)) + */ ListNode * Lst_FindDatum(List *list, const void *datum) { - ListNode *ln; - - assert(datum != NULL); + ListNode *ln; - for (ln = list->first; ln != NULL; ln = ln->next) - if (ln->datum == datum) - return ln; + assert(datum != NULL); - return NULL; -} + for (ln = list->first; ln != NULL; ln = ln->next) + if (ln->datum == datum) + return ln; -int -Lst_ForEachUntil(List *list, LstActionUntilProc proc, void *procData) -{ - ListNode *ln; - int result = 0; - - for (ln = list->first; ln != NULL; ln = ln->next) { - result = proc(ln->datum, procData); - if (result != 0) - break; - } - return result; + return NULL; } -/* Move all nodes from src to the end of dst. - * The source list is destroyed and freed. */ +/* + * Move all nodes from src to the end of dst. + * The source list becomes empty but is not freed. + */ void Lst_MoveAll(List *dst, List *src) { - if (src->first != NULL) { - src->first->prev = dst->last; - if (dst->last != NULL) - dst->last->next = src->first; - else - dst->first = src->first; - - dst->last = src->last; - } - free(src); + if (src->first != NULL) { + src->first->prev = dst->last; + if (dst->last != NULL) + dst->last->next = src->first; + else + dst->first = src->first; + + dst->last = src->last; + } } /* Copy the element data from src to the start of dst. */ void Lst_PrependAll(List *dst, List *src) { - ListNode *node; - for (node = src->last; node != NULL; node = node->prev) - Lst_Prepend(dst, node->datum); + ListNode *ln; + + for (ln = src->last; ln != NULL; ln = ln->prev) + Lst_Prepend(dst, ln->datum); } /* Copy the element data from src to the end of dst. */ void Lst_AppendAll(List *dst, List *src) { - ListNode *node; - for (node = src->first; node != NULL; node = node->next) - Lst_Append(dst, node->datum); -} - -/* - * for using the list as a queue - */ + ListNode *ln; -/* Add the datum to the tail of the given list. */ -void -Lst_Enqueue(List *list, void *datum) -{ - Lst_Append(list, datum); + for (ln = src->first; ln != NULL; ln = ln->next) + Lst_Append(dst, ln->datum); } /* Remove and return the datum at the head of the given list. */ void * Lst_Dequeue(List *list) { - void *datum = list->first->datum; - Lst_Remove(list, list->first); - assert(datum != NULL); /* since NULL would mean end of the list */ - return datum; + void *datum = list->first->datum; + Lst_Remove(list, list->first); + assert(datum != NULL); /* since NULL would mean end of the list */ + return datum; } void Vector_Init(Vector *v, size_t itemSize) { - v->len = 0; - v->priv_cap = 10; - v->itemSize = itemSize; - v->items = bmake_malloc(v->priv_cap * v->itemSize); + v->len = 0; + v->cap = 10; + v->itemSize = itemSize; + v->items = bmake_malloc(v->cap * v->itemSize); } -/* Add space for a new item to the vector and return a pointer to that space. - * The returned data is valid until the next modifying operation. */ +/* + * Add space for a new item to the vector and return a pointer to that space. + * The returned data is valid until the next modifying operation. + */ void * Vector_Push(Vector *v) { - if (v->len >= v->priv_cap) { - v->priv_cap *= 2; - v->items = bmake_realloc(v->items, v->priv_cap * v->itemSize); - } - v->len++; - return Vector_Get(v, v->len - 1); + if (v->len >= v->cap) { + v->cap *= 2; + v->items = bmake_realloc(v->items, v->cap * v->itemSize); + } + v->len++; + return Vector_Get(v, v->len - 1); } -/* Return the pointer to the last item in the vector. - * The returned data is valid until the next modifying operation. */ +/* + * Return the pointer to the last item in the vector. + * The returned data is valid until the next modifying operation. + */ void * Vector_Pop(Vector *v) { - assert(v->len > 0); - v->len--; - return Vector_Get(v, v->len); -} - -void -Vector_Done(Vector *v) -{ - free(v->items); + assert(v->len > 0); + v->len--; + return Vector_Get(v, v->len); } diff --git a/lst.h b/lst.h index 6965678c1e09..30c28ed7096d 100644 --- a/lst.h +++ b/lst.h @@ -1,187 +1,205 @@ -/* $NetBSD: lst.h,v 1.85 2020/11/10 00:32:12 rillig Exp $ */ +/* $NetBSD: lst.h,v 1.95 2021/01/03 21:12:03 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)lst.h 8.1 (Berkeley) 6/6/93 */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)lst.h 8.1 (Berkeley) 6/6/93 */ /* Doubly-linked lists of arbitrary pointers. */ #ifndef MAKE_LST_H #define MAKE_LST_H -#include +#ifdef HAVE_INTTYPES_H +#include +#elif defined(HAVE_STDINT_H) #include +#endif +#ifdef HAVE_STDLIB_H #include +#endif /* A doubly-linked list of pointers. */ -typedef struct List List; +typedef struct List List; /* A single node in the doubly-linked list. */ -typedef struct ListNode ListNode; +typedef struct ListNode ListNode; struct ListNode { - ListNode *prev; /* previous node in list, or NULL */ - ListNode *next; /* next node in list, or NULL */ - union { + ListNode *prev; /* previous node in list, or NULL */ + ListNode *next; /* next node in list, or NULL */ void *datum; /* datum associated with this element */ - const struct GNode *priv_gnode; /* alias, just for debugging */ - const char *priv_str; /* alias, just for debugging */ - }; }; struct List { - ListNode *first; /* first node in list */ - ListNode *last; /* last node in list */ + ListNode *first; + ListNode *last; }; /* Free the datum of a node, called before freeing the node itself. */ typedef void LstFreeProc(void *); -/* An action for Lst_ForEachUntil and Lst_ForEachUntilConcurrent. */ -typedef int LstActionUntilProc(void *datum, void *args); /* Create or destroy a list */ /* Create a new list. */ List *Lst_New(void); +/* Free the list nodes, but not the list itself. */ +void Lst_Done(List *); +/* Free the list nodes, freeing the node data using the given function. */ +void Lst_DoneCall(List *, LstFreeProc); /* Free the list, leaving the node data unmodified. */ void Lst_Free(List *); /* Free the list, freeing the node data using the given function. */ void Lst_Destroy(List *, LstFreeProc); +#define LST_INIT { NULL, NULL } + +/* Initialize a list, without memory allocation. */ +MAKE_INLINE void +Lst_Init(List *list) +{ + list->first = NULL; + list->last = NULL; +} + /* Get information about a list */ MAKE_INLINE Boolean -Lst_IsEmpty(List *list) { return list->first == NULL; } +Lst_IsEmpty(List *list) +{ return list->first == NULL; } /* Find the first node that contains the given datum, or NULL. */ ListNode *Lst_FindDatum(List *, const void *); /* Modify a list */ /* Insert a datum before the given node. */ void Lst_InsertBefore(List *, ListNode *, void *); /* Place a datum at the front of the list. */ void Lst_Prepend(List *, void *); /* Place a datum at the end of the list. */ void Lst_Append(List *, void *); /* Remove the node from the list. */ void Lst_Remove(List *, ListNode *); void Lst_PrependAll(List *, List *); void Lst_AppendAll(List *, List *); void Lst_MoveAll(List *, List *); /* Node-specific functions */ /* Replace the value of the node. */ void LstNode_Set(ListNode *, void *); /* Set the value of the node to NULL. Having NULL in a list is unusual. */ void LstNode_SetNull(ListNode *); -/* Iterating over a list, using a callback function */ - -/* Run the action for each datum of the list, until the action returns - * non-zero. - * - * During this iteration, the list must not be modified structurally. */ -int Lst_ForEachUntil(List *, LstActionUntilProc, void *); - /* Using the list as a queue */ /* Add a datum at the tail of the queue. */ -void Lst_Enqueue(List *, void *); +MAKE_INLINE void +Lst_Enqueue(List *list, void *datum) { + Lst_Append(list, datum); +} + /* Remove the head node of the queue and return its datum. */ void *Lst_Dequeue(List *); -/* A vector is an ordered collection of items, allowing for fast indexed - * access. */ +/* + * A vector is an ordered collection of items, allowing for fast indexed + * access. + */ typedef struct Vector { - void *items; /* memory holding the items */ - size_t itemSize; /* size of a single item in bytes */ - size_t len; /* number of actually usable elements */ - size_t priv_cap; /* capacity */ + void *items; /* memory holding the items */ + size_t itemSize; /* size of a single item */ + size_t len; /* number of actually usable elements */ + size_t cap; /* capacity */ } Vector; void Vector_Init(Vector *, size_t); -/* Return the pointer to the given item in the vector. - * The returned data is valid until the next modifying operation. */ +/* + * Return the pointer to the given item in the vector. + * The returned data is valid until the next modifying operation. + */ MAKE_INLINE void * Vector_Get(Vector *v, size_t i) { - unsigned char *items = v->items; - return items + i * v->itemSize; + unsigned char *items = v->items; + return items + i * v->itemSize; } void *Vector_Push(Vector *); void *Vector_Pop(Vector *); -void Vector_Done(Vector *); + +MAKE_INLINE void +Vector_Done(Vector *v) { + free(v->items); +} #endif /* MAKE_LST_H */ diff --git a/main.c b/main.c index 6e97a9a12541..f2813d263c2a 100644 --- a/main.c +++ b/main.c @@ -1,2269 +1,2289 @@ -/* $NetBSD: main.c,v 1.476 2020/11/16 22:08:20 rillig Exp $ */ +/* $NetBSD: main.c,v 1.512 2021/01/10 23:59:53 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* The main file for this entire program. Exit routines etc. reside here. +/* + * The main file for this entire program. Exit routines etc. reside here. * * Utility functions defined in this file: * * Main_ParseArgLine Parse and process command line arguments from * a single string. Used to implement the * special targets .MFLAGS and .MAKEFLAGS. * * Error Print a tagged error message. * * Fatal Print an error message and exit. * * Punt Abort all jobs and exit with a message. * * Finish Finish things up by printing the number of * errors which occurred, and exit. */ #include #include #include #include #include #if defined(MAKE_NATIVE) && defined(HAVE_SYSCTL) #include #endif #include #include "wait.h" #include #include #include #include #include "make.h" #include "dir.h" #include "job.h" #include "pathnames.h" #include "trace.h" /* "@(#)main.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: main.c,v 1.476 2020/11/16 22:08:20 rillig Exp $"); +MAKE_RCSID("$NetBSD: main.c,v 1.512 2021/01/10 23:59:53 rillig Exp $"); #if defined(MAKE_NATIVE) && !defined(lint) __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 " "The Regents of the University of California. " "All rights reserved."); #endif -#ifndef DEFMAXLOCAL -#define DEFMAXLOCAL DEFMAXJOBS -#endif - #ifndef __arraycount # define __arraycount(__x) (sizeof(__x) / sizeof(__x[0])) #endif CmdOpts opts; time_t now; /* Time at start of make */ GNode *defaultNode; /* .DEFAULT node */ Boolean allPrecious; /* .PRECIOUS given on line by itself */ Boolean deleteOnError; /* .DELETE_ON_ERROR: set */ static int maxJobTokens; /* -j argument */ Boolean enterFlagObj; /* -w and objdir != srcdir */ -Boolean preserveUndefined; static int jp_0 = -1, jp_1 = -1; /* ends of parent job pipe */ Boolean doing_depend; /* Set while reading .depend */ static Boolean jobsRunning; /* TRUE if the jobs might be running */ static const char *tracefile; static int ReadMakefile(const char *); static void purge_relative_cached_realpaths(void); static Boolean ignorePWD; /* if we use -C, PWD is meaningless */ static char objdir[MAXPATHLEN + 1]; /* where we chdir'ed to */ char curdir[MAXPATHLEN + 1]; /* Startup directory */ -char *progname; /* the program name */ +const char *progname; char *makeDependfile; pid_t myPid; int makelevel; Boolean forceJobs = FALSE; -static int errors = 0; +static int main_errors = 0; static HashTable cached_realpaths; /* * For compatibility with the POSIX version of MAKEFLAGS that includes * all the options without '-', convert 'flags' to '-f -l -a -g -s'. */ static char * explode(const char *flags) { size_t len; char *nf, *st; const char *f; if (flags == NULL) return NULL; - for (f = flags; *f; f++) + for (f = flags; *f != '\0'; f++) if (!ch_isalpha(*f)) break; - if (*f) + if (*f != '\0') return bmake_strdup(flags); len = strlen(flags); st = nf = bmake_malloc(len * 3 + 1); - while (*flags) { + while (*flags != '\0') { *nf++ = '-'; *nf++ = *flags++; *nf++ = ' '; } *nf = '\0'; return st; } /* * usage -- * exit with usage message */ MAKE_ATTR_DEAD static void usage(void) { size_t prognameLen = strcspn(progname, "["); (void)fprintf(stderr, "usage: %.*s [-BeikNnqrSstWwX]\n" " [-C directory] [-D variable] [-d flags] [-f makefile]\n" " [-I directory] [-J private] [-j max_jobs] [-m directory] [-T file]\n" " [-V variable] [-v variable] [variable=value] [target ...]\n", (int)prognameLen, progname); exit(2); } static void parse_debug_option_F(const char *modules) { const char *mode; size_t len; char *fname; if (opts.debug_file != stdout && opts.debug_file != stderr) fclose(opts.debug_file); if (*modules == '+') { modules++; mode = "a"; } else mode = "w"; if (strcmp(modules, "stdout") == 0) { opts.debug_file = stdout; return; } if (strcmp(modules, "stderr") == 0) { opts.debug_file = stderr; return; } len = strlen(modules); fname = bmake_malloc(len + 20); memcpy(fname, modules, len + 1); /* Let the filename be modified by the pid */ if (strcmp(fname + len - 3, ".%d") == 0) snprintf(fname + len - 2, 20, "%d", getpid()); opts.debug_file = fopen(fname, mode); if (opts.debug_file == NULL) { fprintf(stderr, "Cannot open debug file %s\n", fname); usage(); } free(fname); } static void parse_debug_options(const char *argvalue) { const char *modules; DebugFlags debug = opts.debug; - for (modules = argvalue; *modules; ++modules) { + for (modules = argvalue; *modules != '\0'; ++modules) { switch (*modules) { case '0': /* undocumented, only intended for tests */ debug = DEBUG_NONE; break; case 'A': debug = DEBUG_ALL; break; case 'a': debug |= DEBUG_ARCH; break; case 'C': debug |= DEBUG_CWD; break; case 'c': debug |= DEBUG_COND; break; case 'd': debug |= DEBUG_DIR; break; case 'e': debug |= DEBUG_ERROR; break; case 'f': debug |= DEBUG_FOR; break; case 'g': if (modules[1] == '1') { debug |= DEBUG_GRAPH1; modules++; } else if (modules[1] == '2') { debug |= DEBUG_GRAPH2; modules++; } else if (modules[1] == '3') { debug |= DEBUG_GRAPH3; modules++; } break; case 'h': debug |= DEBUG_HASH; break; case 'j': debug |= DEBUG_JOB; break; case 'L': - opts.lint = TRUE; + opts.strict = TRUE; break; case 'l': debug |= DEBUG_LOUD; break; case 'M': debug |= DEBUG_META; break; case 'm': debug |= DEBUG_MAKE; break; case 'n': debug |= DEBUG_SCRIPT; break; case 'p': debug |= DEBUG_PARSE; break; case 's': debug |= DEBUG_SUFF; break; case 't': debug |= DEBUG_TARG; break; case 'V': opts.debugVflag = TRUE; break; case 'v': debug |= DEBUG_VAR; break; case 'x': debug |= DEBUG_SHELL; break; case 'F': parse_debug_option_F(modules + 1); goto debug_setbuf; default: (void)fprintf(stderr, "%s: illegal argument to d option -- %c\n", progname, *modules); usage(); } } debug_setbuf: opts.debug = debug; /* * Make the debug_file unbuffered, and make * stdout line buffered (unless debugfile == stdout). */ setvbuf(opts.debug_file, NULL, _IONBF, 0); if (opts.debug_file != stdout) { setvbuf(stdout, NULL, _IOLBF, 0); } } /* * does path contain any relative components */ static Boolean is_relpath(const char *path) { const char *cp; if (path[0] != '/') return TRUE; cp = path; while ((cp = strstr(cp, "/.")) != NULL) { cp += 2; if (*cp == '.') cp++; if (cp[0] == '/' || cp[0] == '\0') return TRUE; } return FALSE; } static void MainParseArgChdir(const char *argvalue) { struct stat sa, sb; if (chdir(argvalue) == -1) { (void)fprintf(stderr, "%s: chdir %s: %s\n", progname, argvalue, strerror(errno)); - exit(1); + exit(2); /* Not 1 so -q can distinguish error */ } if (getcwd(curdir, MAXPATHLEN) == NULL) { (void)fprintf(stderr, "%s: %s.\n", progname, strerror(errno)); exit(2); } if (!is_relpath(argvalue) && stat(argvalue, &sa) != -1 && stat(curdir, &sb) != -1 && sa.st_ino == sb.st_ino && sa.st_dev == sb.st_dev) strncpy(curdir, argvalue, MAXPATHLEN); ignorePWD = TRUE; } static void MainParseArgJobsInternal(const char *argvalue) { char end; if (sscanf(argvalue, "%d,%d%c", &jp_0, &jp_1, &end) != 2) { (void)fprintf(stderr, "%s: internal error -- J option malformed (%s)\n", progname, argvalue); usage(); } if ((fcntl(jp_0, F_GETFD, 0) < 0) || (fcntl(jp_1, F_GETFD, 0) < 0)) { #if 0 (void)fprintf(stderr, "%s: ###### warning -- J descriptors were closed!\n", progname); exit(2); #endif jp_0 = -1; jp_1 = -1; opts.compatMake = TRUE; } else { Var_Append(MAKEFLAGS, "-J", VAR_GLOBAL); Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL); } } static void MainParseArgJobs(const char *argvalue) { char *p; forceJobs = TRUE; opts.maxJobs = (int)strtol(argvalue, &p, 0); if (*p != '\0' || opts.maxJobs < 1) { (void)fprintf(stderr, "%s: illegal argument to -j -- must be positive integer!\n", progname); - exit(1); /* XXX: why not 2? */ + exit(2); /* Not 1 so -q can distinguish error */ } Var_Append(MAKEFLAGS, "-j", VAR_GLOBAL); Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL); Var_Set(".MAKE.JOBS", argvalue, VAR_GLOBAL); maxJobTokens = opts.maxJobs; } static void MainParseArgSysInc(const char *argvalue) { /* look for magic parent directory search string */ if (strncmp(".../", argvalue, 4) == 0) { char *found_path = Dir_FindHereOrAbove(curdir, argvalue + 4); if (found_path == NULL) return; (void)Dir_AddDir(sysIncPath, found_path); free(found_path); } else { (void)Dir_AddDir(sysIncPath, argvalue); } Var_Append(MAKEFLAGS, "-m", VAR_GLOBAL); Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL); } static Boolean MainParseArg(char c, const char *argvalue) { switch (c) { case '\0': break; case 'B': opts.compatMake = TRUE; Var_Append(MAKEFLAGS, "-B", VAR_GLOBAL); Var_Set(MAKE_MODE, "compat", VAR_GLOBAL); break; case 'C': MainParseArgChdir(argvalue); break; case 'D': if (argvalue[0] == '\0') return FALSE; Var_Set(argvalue, "1", VAR_GLOBAL); Var_Append(MAKEFLAGS, "-D", VAR_GLOBAL); Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL); break; case 'I': Parse_AddIncludeDir(argvalue); Var_Append(MAKEFLAGS, "-I", VAR_GLOBAL); Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL); break; case 'J': MainParseArgJobsInternal(argvalue); break; case 'N': opts.noExecute = TRUE; opts.noRecursiveExecute = TRUE; Var_Append(MAKEFLAGS, "-N", VAR_GLOBAL); break; case 'S': opts.keepgoing = FALSE; Var_Append(MAKEFLAGS, "-S", VAR_GLOBAL); break; case 'T': tracefile = bmake_strdup(argvalue); Var_Append(MAKEFLAGS, "-T", VAR_GLOBAL); Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL); break; case 'V': case 'v': opts.printVars = c == 'v' ? PVM_EXPANDED : PVM_UNEXPANDED; - Lst_Append(opts.variables, bmake_strdup(argvalue)); + Lst_Append(&opts.variables, bmake_strdup(argvalue)); /* XXX: Why always -V? */ Var_Append(MAKEFLAGS, "-V", VAR_GLOBAL); Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL); break; case 'W': opts.parseWarnFatal = TRUE; /* XXX: why no Var_Append? */ break; case 'X': opts.varNoExportEnv = TRUE; Var_Append(MAKEFLAGS, "-X", VAR_GLOBAL); break; case 'd': /* If '-d-opts' don't pass to children */ if (argvalue[0] == '-') argvalue++; else { Var_Append(MAKEFLAGS, "-d", VAR_GLOBAL); Var_Append(MAKEFLAGS, argvalue, VAR_GLOBAL); } parse_debug_options(argvalue); break; case 'e': opts.checkEnvFirst = TRUE; Var_Append(MAKEFLAGS, "-e", VAR_GLOBAL); break; case 'f': - Lst_Append(opts.makefiles, bmake_strdup(argvalue)); + Lst_Append(&opts.makefiles, bmake_strdup(argvalue)); break; case 'i': opts.ignoreErrors = TRUE; Var_Append(MAKEFLAGS, "-i", VAR_GLOBAL); break; case 'j': MainParseArgJobs(argvalue); break; case 'k': opts.keepgoing = TRUE; Var_Append(MAKEFLAGS, "-k", VAR_GLOBAL); break; case 'm': MainParseArgSysInc(argvalue); /* XXX: why no Var_Append? */ break; case 'n': opts.noExecute = TRUE; Var_Append(MAKEFLAGS, "-n", VAR_GLOBAL); break; case 'q': opts.queryFlag = TRUE; /* Kind of nonsensical, wot? */ Var_Append(MAKEFLAGS, "-q", VAR_GLOBAL); break; case 'r': opts.noBuiltins = TRUE; Var_Append(MAKEFLAGS, "-r", VAR_GLOBAL); break; case 's': opts.beSilent = TRUE; Var_Append(MAKEFLAGS, "-s", VAR_GLOBAL); break; case 't': opts.touchFlag = TRUE; Var_Append(MAKEFLAGS, "-t", VAR_GLOBAL); break; case 'w': opts.enterFlag = TRUE; Var_Append(MAKEFLAGS, "-w", VAR_GLOBAL); break; default: case '?': usage(); } return TRUE; } -/* Parse the given arguments. Called from main() and from +/* + * Parse the given arguments. Called from main() and from * Main_ParseArgLine() when the .MAKEFLAGS target is used. * * The arguments must be treated as read-only and will be freed after the * call. * - * XXX: Deal with command line overriding .MAKEFLAGS in makefile */ + * XXX: Deal with command line overriding .MAKEFLAGS in makefile + */ static void MainParseArgs(int argc, char **argv) { char c; int arginc; char *argvalue; char *optscan; Boolean inOption, dashDash = FALSE; const char *optspecs = "BC:D:I:J:NST:V:WXd:ef:ij:km:nqrstv:w"; /* Can't actually use getopt(3) because rescanning is not portable */ rearg: inOption = FALSE; optscan = NULL; while (argc > 1) { const char *optspec; if (!inOption) optscan = argv[1]; c = *optscan++; arginc = 0; if (inOption) { if (c == '\0') { argv++; argc--; inOption = FALSE; continue; } } else { if (c != '-' || dashDash) break; inOption = TRUE; c = *optscan++; } /* '-' found at some earlier point */ optspec = strchr(optspecs, c); if (c != '\0' && optspec != NULL && optspec[1] == ':') { /* - found, and should have an arg */ inOption = FALSE; arginc = 1; argvalue = optscan; if (*argvalue == '\0') { if (argc < 3) goto noarg; argvalue = argv[2]; arginc = 2; } } else { argvalue = NULL; } switch (c) { case '\0': arginc = 1; inOption = FALSE; break; case '-': dashDash = TRUE; break; default: if (!MainParseArg(c, argvalue)) goto noarg; } argv += arginc; argc -= arginc; } /* * See if the rest of the arguments are variable assignments and * perform them if so. Else take them to be targets and stuff them * on the end of the "create" list. */ for (; argc > 1; ++argv, --argc) { VarAssign var; if (Parse_IsVar(argv[1], &var)) { Parse_DoVar(&var, VAR_CMDLINE); } else { if (argv[1][0] == '\0') Punt("illegal (null) argument."); if (argv[1][0] == '-' && !dashDash) goto rearg; - Lst_Append(opts.create, bmake_strdup(argv[1])); + Lst_Append(&opts.create, bmake_strdup(argv[1])); } } return; noarg: (void)fprintf(stderr, "%s: option requires an argument -- %c\n", progname, c); usage(); } -/* Break a line of arguments into words and parse them. +/* + * Break a line of arguments into words and parse them. * * Used when a .MFLAGS or .MAKEFLAGS target is encountered during parsing and - * by main() when reading the MAKEFLAGS environment variable. */ + * by main() when reading the MAKEFLAGS environment variable. + */ void Main_ParseArgLine(const char *line) { Words words; char *buf; if (line == NULL) return; + /* XXX: don't use line as an iterator variable */ for (; *line == ' '; ++line) continue; if (line[0] == '\0') return; #ifndef POSIX { /* * $MAKE may simply be naming the make(1) binary */ char *cp; if (!(cp = strrchr(line, '/'))) cp = line; if ((cp = strstr(cp, "make")) && strcmp(cp, "make") == 0) return; } #endif { - void *freeIt; - const char *argv0 = Var_Value(".MAKE", VAR_GLOBAL, &freeIt); - buf = str_concat3(argv0, " ", line); - free(freeIt); + FStr argv0 = Var_Value(".MAKE", VAR_GLOBAL); + buf = str_concat3(argv0.str, " ", line); + FStr_Done(&argv0); } words = Str_Words(buf, TRUE); if (words.words == NULL) { Error("Unterminated quoted string [%s]", buf); free(buf); return; } free(buf); MainParseArgs((int)words.len, words.words); Words_Free(words); } Boolean Main_SetObjdir(Boolean writable, const char *fmt, ...) { struct stat sb; char *path; char buf[MAXPATHLEN + 1]; char buf2[MAXPATHLEN + 1]; Boolean rc = FALSE; va_list ap; va_start(ap, fmt); vsnprintf(path = buf, MAXPATHLEN, fmt, ap); va_end(ap); if (path[0] != '/') { snprintf(buf2, MAXPATHLEN, "%s/%s", curdir, path); path = buf2; } /* look for the directory and try to chdir there */ if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) { if ((writable && access(path, W_OK) != 0) || (chdir(path) != 0)) { (void)fprintf(stderr, "%s warning: %s: %s.\n", progname, path, strerror(errno)); } else { snprintf(objdir, sizeof objdir, "%s", path); Var_Set(".OBJDIR", objdir, VAR_GLOBAL); setenv("PWD", objdir, 1); Dir_InitDot(); purge_relative_cached_realpaths(); rc = TRUE; if (opts.enterFlag && strcmp(objdir, curdir) != 0) enterFlagObj = TRUE; } } return rc; } static Boolean SetVarObjdir(Boolean writable, const char *var, const char *suffix) { - void *path_freeIt; - const char *path = Var_Value(var, VAR_CMDLINE, &path_freeIt); - const char *xpath; - char *xpath_freeIt; + FStr path = Var_Value(var, VAR_CMDLINE); + FStr xpath; - if (path == NULL || path[0] == '\0') { - bmake_free(path_freeIt); + if (path.str == NULL || path.str[0] == '\0') { + FStr_Done(&path); return FALSE; } /* expand variable substitutions */ - xpath = path; - xpath_freeIt = NULL; - if (strchr(path, '$') != 0) { - (void)Var_Subst(path, VAR_GLOBAL, VARE_WANTRES, &xpath_freeIt); + xpath = FStr_InitRefer(path.str); + if (strchr(path.str, '$') != 0) { + char *expanded; + (void)Var_Subst(path.str, VAR_GLOBAL, VARE_WANTRES, &expanded); /* TODO: handle errors */ - xpath = xpath_freeIt; + xpath = FStr_InitOwn(expanded); } - (void)Main_SetObjdir(writable, "%s%s", xpath, suffix); + (void)Main_SetObjdir(writable, "%s%s", xpath.str, suffix); - bmake_free(xpath_freeIt); - bmake_free(path_freeIt); + FStr_Done(&xpath); + FStr_Done(&path); return TRUE; } -/* Splits str into words, adding them to the list. - * The string must be kept alive as long as the list. */ +/* + * Splits str into words, adding them to the list. + * The string must be kept alive as long as the list. + */ int str2Lst_Append(StringList *lp, char *str) { char *cp; int n; const char *sep = " \t"; - for (n = 0, cp = strtok(str, sep); cp; cp = strtok(NULL, sep)) { + for (n = 0, cp = strtok(str, sep); cp != NULL; cp = strtok(NULL, sep)) { Lst_Append(lp, cp); n++; } return n; } #ifdef SIGINFO /*ARGSUSED*/ static void siginfo(int signo MAKE_ATTR_UNUSED) { char dir[MAXPATHLEN]; char str[2 * MAXPATHLEN]; int len; if (getcwd(dir, sizeof dir) == NULL) return; len = snprintf(str, sizeof str, "%s: Working in: %s\n", progname, dir); if (len > 0) (void)write(STDERR_FILENO, str, (size_t)len); } #endif -/* - * Allow makefiles some control over the mode we run in. - */ -void -MakeMode(const char *mode) +/* Allow makefiles some control over the mode we run in. */ +static void +MakeMode(void) { - char *mode_freeIt = NULL; + FStr mode = FStr_InitRefer(NULL); - if (mode == NULL) { + if (mode.str == NULL) { + char *expanded; (void)Var_Subst("${" MAKE_MODE ":tl}", - VAR_GLOBAL, VARE_WANTRES, &mode_freeIt); + VAR_GLOBAL, VARE_WANTRES, &expanded); /* TODO: handle errors */ - mode = mode_freeIt; + mode = FStr_InitOwn(expanded); } - if (mode[0] != '\0') { - if (strstr(mode, "compat")) { + if (mode.str[0] != '\0') { + if (strstr(mode.str, "compat") != NULL) { opts.compatMake = TRUE; forceJobs = FALSE; } #if USE_META - if (strstr(mode, "meta")) - meta_mode_init(mode); + if (strstr(mode.str, "meta") != NULL) + meta_mode_init(mode.str); #endif } - free(mode_freeIt); + FStr_Done(&mode); } static void PrintVar(const char *varname, Boolean expandVars) { - if (strchr(varname, '$')) { + if (strchr(varname, '$') != NULL) { char *evalue; (void)Var_Subst(varname, VAR_GLOBAL, VARE_WANTRES, &evalue); /* TODO: handle errors */ printf("%s\n", evalue); bmake_free(evalue); } else if (expandVars) { char *expr = str_concat3("${", varname, "}"); char *evalue; (void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &evalue); /* TODO: handle errors */ free(expr); printf("%s\n", evalue); bmake_free(evalue); } else { - void *freeIt; - const char *value = Var_Value(varname, VAR_GLOBAL, &freeIt); - printf("%s\n", value ? value : ""); - bmake_free(freeIt); + FStr value = Var_Value(varname, VAR_GLOBAL); + printf("%s\n", value.str != NULL ? value.str : ""); + FStr_Done(&value); } } /* * Return a Boolean based on a variable. * * If the knob is not set, return the fallback. * If set, anything that looks or smells like "No", "False", "Off", "0", etc. * is FALSE, otherwise TRUE. */ Boolean GetBooleanVar(const char *varname, Boolean fallback) { char *expr = str_concat3("${", varname, ":U}"); char *value; Boolean res; (void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &value); /* TODO: handle errors */ res = ParseBoolean(value, fallback); free(value); free(expr); return res; } static void doPrintVars(void) { StringListNode *ln; Boolean expandVars; if (opts.printVars == PVM_EXPANDED) expandVars = TRUE; else if (opts.debugVflag) expandVars = FALSE; else expandVars = GetBooleanVar(".MAKE.EXPAND_VARIABLES", FALSE); - for (ln = opts.variables->first; ln != NULL; ln = ln->next) { + for (ln = opts.variables.first; ln != NULL; ln = ln->next) { const char *varname = ln->datum; PrintVar(varname, expandVars); } } static Boolean runTargets(void) { - GNodeList *targs; /* target nodes to create */ + GNodeList targs = LST_INIT; /* target nodes to create */ Boolean outOfDate; /* FALSE if all targets up to date */ /* * Have now read the entire graph and need to make a list of * targets to create. If none was given on the command line, * we consult the parsing module to find the main target(s) * to create. */ - if (Lst_IsEmpty(opts.create)) - targs = Parse_MainName(); + if (Lst_IsEmpty(&opts.create)) + Parse_MainName(&targs); else - targs = Targ_FindList(opts.create); + Targ_FindList(&targs, &opts.create); if (!opts.compatMake) { /* * Initialize job module before traversing the graph * now that any .BEGIN and .END targets have been read. * This is done only if the -q flag wasn't given * (to prevent the .BEGIN from being executed should * it exist). */ if (!opts.queryFlag) { Job_Init(); jobsRunning = TRUE; } /* Traverse the graph, checking on all the targets */ - outOfDate = Make_Run(targs); + outOfDate = Make_Run(&targs); } else { /* * Compat_Init will take care of creating all the * targets as well as initializing the module. */ - Compat_Run(targs); + Compat_Run(&targs); outOfDate = FALSE; } - Lst_Free(targs); + Lst_Done(&targs); /* Don't free the nodes. */ return outOfDate; } /* * Set up the .TARGETS variable to contain the list of targets to be * created. If none specified, make the variable empty -- the parser * will fill the thing in with the default or .MAIN target. */ static void InitVarTargets(void) { StringListNode *ln; - if (Lst_IsEmpty(opts.create)) { + if (Lst_IsEmpty(&opts.create)) { Var_Set(".TARGETS", "", VAR_GLOBAL); return; } - for (ln = opts.create->first; ln != NULL; ln = ln->next) { + for (ln = opts.create.first; ln != NULL; ln = ln->next) { char *name = ln->datum; Var_Append(".TARGETS", name, VAR_GLOBAL); } } static void InitRandom(void) { struct timeval tv; gettimeofday(&tv, NULL); srandom((unsigned int)(tv.tv_sec + tv.tv_usec)); } static const char * InitVarMachine(const struct utsname *utsname) { #ifdef FORCE_MACHINE return FORCE_MACHINE; #else const char *machine = getenv("MACHINE"); if (machine != NULL) return machine; #if defined(MAKE_NATIVE) return utsname->machine; #elif defined(MAKE_MACHINE) return MAKE_MACHINE; #else return "unknown"; #endif #endif } static const char * InitVarMachineArch(void) { #ifdef FORCE_MACHINE_ARCH return FORCE_MACHINE_ARCH; #else const char *env = getenv("MACHINE_ARCH"); if (env != NULL) return env; #if defined(MAKE_NATIVE) && defined(CTL_HW) { struct utsname utsname; static char machine_arch_buf[sizeof utsname.machine]; const int mib[2] = { CTL_HW, HW_MACHINE_ARCH }; size_t len = sizeof machine_arch_buf; - if (sysctl(mib, __arraycount(mib), machine_arch_buf, - &len, NULL, 0) < 0) { - (void)fprintf(stderr, "%s: sysctl failed (%s).\n", progname, - strerror(errno)); - exit(2); + if (sysctl(mib, (unsigned int)__arraycount(mib), + machine_arch_buf, &len, NULL, 0) < 0) { + (void)fprintf(stderr, "%s: sysctl failed (%s).\n", + progname, strerror(errno)); + exit(2); } return machine_arch_buf; } #elif defined(MACHINE_ARCH) return MACHINE_ARCH; #elif defined(MAKE_MACHINE_ARCH) return MAKE_MACHINE_ARCH; #else return "unknown"; #endif #endif } #ifndef NO_PWD_OVERRIDE /* * All this code is so that we know where we are when we start up * on a different machine with pmake. * * Overriding getcwd() with $PWD totally breaks MAKEOBJDIRPREFIX * since the value of curdir can vary depending on how we got * here. Ie sitting at a shell prompt (shell that provides $PWD) * or via subdir.mk in which case its likely a shell which does * not provide it. * * So, to stop it breaking this case only, we ignore PWD if * MAKEOBJDIRPREFIX is set or MAKEOBJDIR contains a variable expression. */ static void HandlePWD(const struct stat *curdir_st) { char *pwd; - void *prefix_freeIt, *makeobjdir_freeIt; - const char *makeobjdir; + FStr prefix, makeobjdir; struct stat pwd_st; if (ignorePWD || (pwd = getenv("PWD")) == NULL) return; - if (Var_Value("MAKEOBJDIRPREFIX", VAR_CMDLINE, &prefix_freeIt) != - NULL) { - bmake_free(prefix_freeIt); + prefix = Var_Value("MAKEOBJDIRPREFIX", VAR_CMDLINE); + if (prefix.str != NULL) { + FStr_Done(&prefix); return; } - makeobjdir = Var_Value("MAKEOBJDIR", VAR_CMDLINE, &makeobjdir_freeIt); - if (makeobjdir != NULL && strchr(makeobjdir, '$') != NULL) + makeobjdir = Var_Value("MAKEOBJDIR", VAR_CMDLINE); + if (makeobjdir.str != NULL && strchr(makeobjdir.str, '$') != NULL) goto ignore_pwd; if (stat(pwd, &pwd_st) == 0 && curdir_st->st_ino == pwd_st.st_ino && curdir_st->st_dev == pwd_st.st_dev) (void)strncpy(curdir, pwd, MAXPATHLEN); ignore_pwd: - bmake_free(makeobjdir_freeIt); + FStr_Done(&makeobjdir); } #endif /* * Find the .OBJDIR. If MAKEOBJDIRPREFIX, or failing that, * MAKEOBJDIR is set in the environment, try only that value * and fall back to .CURDIR if it does not exist. * * Otherwise, try _PATH_OBJDIR.MACHINE-MACHINE_ARCH, _PATH_OBJDIR.MACHINE, * and * finally _PATH_OBJDIRPREFIX`pwd`, in that order. If none * of these paths exist, just use .CURDIR. */ static void InitObjdir(const char *machine, const char *machine_arch) { Boolean writable; - Dir_InitDir(curdir); + Dir_InitCur(curdir); writable = GetBooleanVar("MAKE_OBJDIR_CHECK_WRITABLE", TRUE); (void)Main_SetObjdir(FALSE, "%s", curdir); if (!SetVarObjdir(writable, "MAKEOBJDIRPREFIX", curdir) && !SetVarObjdir(writable, "MAKEOBJDIR", "") && !Main_SetObjdir(writable, "%s.%s-%s", _PATH_OBJDIR, machine, machine_arch) && !Main_SetObjdir(writable, "%s.%s", _PATH_OBJDIR, machine) && !Main_SetObjdir(writable, "%s", _PATH_OBJDIR)) (void)Main_SetObjdir(writable, "%s%s", _PATH_OBJDIRPREFIX, curdir); } /* get rid of resource limit on file descriptors */ static void UnlimitFiles(void) { #if defined(MAKE_NATIVE) || (defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE)) struct rlimit rl; if (getrlimit(RLIMIT_NOFILE, &rl) != -1 && rl.rlim_cur != rl.rlim_max) { rl.rlim_cur = rl.rlim_max; (void)setrlimit(RLIMIT_NOFILE, &rl); } #endif } static void CmdOpts_Init(void) { - opts.compatMake = FALSE; /* No compat mode */ - opts.debug = 0; /* No debug verbosity, please. */ + opts.compatMake = FALSE; + opts.debug = DEBUG_NONE; /* opts.debug_file has been initialized earlier */ - opts.lint = FALSE; + opts.strict = FALSE; opts.debugVflag = FALSE; opts.checkEnvFirst = FALSE; - opts.makefiles = Lst_New(); + Lst_Init(&opts.makefiles); opts.ignoreErrors = FALSE; /* Pay attention to non-zero returns */ - opts.maxJobs = DEFMAXLOCAL; /* Set default local max concurrency */ + opts.maxJobs = 1; opts.keepgoing = FALSE; /* Stop on error */ opts.noRecursiveExecute = FALSE; /* Execute all .MAKE targets */ opts.noExecute = FALSE; /* Execute all commands */ - opts.queryFlag = FALSE; /* This is not just a check-run */ + opts.queryFlag = FALSE; opts.noBuiltins = FALSE; /* Read the built-in rules */ opts.beSilent = FALSE; /* Print commands as executed */ - opts.touchFlag = FALSE; /* Actually update targets */ + opts.touchFlag = FALSE; opts.printVars = PVM_NONE; - opts.variables = Lst_New(); + Lst_Init(&opts.variables); opts.parseWarnFatal = FALSE; opts.enterFlag = FALSE; opts.varNoExportEnv = FALSE; - opts.create = Lst_New(); + Lst_Init(&opts.create); } -/* Initialize MAKE and .MAKE to the path of the executable, so that it can be +/* + * Initialize MAKE and .MAKE to the path of the executable, so that it can be * found by execvp(3) and the shells, even after a chdir. * * If it's a relative path and contains a '/', resolve it to an absolute path. - * Otherwise keep it as is, assuming it will be found in the PATH. */ + * Otherwise keep it as is, assuming it will be found in the PATH. + */ static void InitVarMake(const char *argv0) { const char *make = argv0; if (argv0[0] != '/' && strchr(argv0, '/') != NULL) { char pathbuf[MAXPATHLEN]; - const char *abs = cached_realpath(argv0, pathbuf); + const char *abspath = cached_realpath(argv0, pathbuf); struct stat st; - if (abs != NULL && abs[0] == '/' && stat(make, &st) == 0) - make = abs; + if (abspath != NULL && abspath[0] == '/' && + stat(make, &st) == 0) + make = abspath; } Var_Set("MAKE", make, VAR_GLOBAL); Var_Set(".MAKE", make, VAR_GLOBAL); } -/* Add the directories from the colon-separated syspath to defSysIncPath. - * After returning, the contents of syspath is unspecified. */ +/* + * Add the directories from the colon-separated syspath to defSysIncPath. + * After returning, the contents of syspath is unspecified. + */ static void InitDefSysIncPath(char *syspath) { static char defsyspath[] = _PATH_DEFSYSPATH; char *start, *cp; /* * If no user-supplied system path was given (through the -m option) * add the directories from the DEFSYSPATH (more than one may be given * as dir1:...:dirn) to the system include path. */ if (syspath == NULL || syspath[0] == '\0') syspath = defsyspath; else syspath = bmake_strdup(syspath); for (start = syspath; *start != '\0'; start = cp) { for (cp = start; *cp != '\0' && *cp != ':'; cp++) continue; if (*cp == ':') *cp++ = '\0'; /* look for magic parent directory search string */ if (strncmp(start, ".../", 4) == 0) { char *dir = Dir_FindHereOrAbove(curdir, start + 4); if (dir != NULL) { (void)Dir_AddDir(defSysIncPath, dir); free(dir); } } else { (void)Dir_AddDir(defSysIncPath, start); } } if (syspath != defsyspath) free(syspath); } static void ReadBuiltinRules(void) { StringListNode *ln; - StringList *sysMkPath = Lst_New(); + StringList sysMkPath = LST_INIT; Dir_Expand(_PATH_DEFSYSMK, Lst_IsEmpty(sysIncPath) ? defSysIncPath : sysIncPath, - sysMkPath); - if (Lst_IsEmpty(sysMkPath)) + &sysMkPath); + if (Lst_IsEmpty(&sysMkPath)) Fatal("%s: no system rules (%s).", progname, _PATH_DEFSYSMK); - for (ln = sysMkPath->first; ln != NULL; ln = ln->next) + for (ln = sysMkPath.first; ln != NULL; ln = ln->next) if (ReadMakefile(ln->datum) == 0) break; if (ln == NULL) Fatal("%s: cannot open %s.", - progname, (const char *)sysMkPath->first->datum); + progname, (const char *)sysMkPath.first->datum); /* Free the list but not the actual filenames since these may still * be used in GNodes. */ - Lst_Free(sysMkPath); + Lst_Done(&sysMkPath); } static void InitMaxJobs(void) { char *value; int n; if (forceJobs || opts.compatMake || !Var_Exists(".MAKE.JOBS", VAR_GLOBAL)) return; (void)Var_Subst("${.MAKE.JOBS}", VAR_GLOBAL, VARE_WANTRES, &value); /* TODO: handle errors */ n = (int)strtol(value, NULL, 0); if (n < 1) { (void)fprintf(stderr, "%s: illegal value for .MAKE.JOBS " "-- must be positive integer!\n", progname); - exit(1); + exit(2); /* Not 1 so -q can distinguish error */ } if (n != opts.maxJobs) { Var_Append(MAKEFLAGS, "-j", VAR_GLOBAL); Var_Append(MAKEFLAGS, value, VAR_GLOBAL); } opts.maxJobs = n; maxJobTokens = opts.maxJobs; forceJobs = TRUE; free(value); } /* * For compatibility, look at the directories in the VPATH variable * and add them to the search path, if the variable is defined. The * variable's value is in the same format as the PATH environment * variable, i.e. ::... */ static void InitVpath(void) { char *vpath, savec, *path; if (!Var_Exists("VPATH", VAR_CMDLINE)) return; (void)Var_Subst("${VPATH}", VAR_CMDLINE, VARE_WANTRES, &vpath); /* TODO: handle errors */ path = vpath; do { char *cp; /* skip to end of directory */ for (cp = path; *cp != ':' && *cp != '\0'; cp++) continue; /* Save terminator character so know when to stop */ savec = *cp; *cp = '\0'; /* Add directory to search path */ - (void)Dir_AddDir(dirSearchPath, path); + (void)Dir_AddDir(&dirSearchPath, path); *cp = savec; path = cp + 1; } while (savec == ':'); free(vpath); } static void ReadAllMakefiles(StringList *makefiles) { StringListNode *ln; for (ln = makefiles->first; ln != NULL; ln = ln->next) { const char *fname = ln->datum; if (ReadMakefile(fname) != 0) Fatal("%s: cannot open %s.", progname, fname); } } static void ReadFirstDefaultMakefile(void) { StringListNode *ln; char *prefs; (void)Var_Subst("${" MAKE_MAKEFILE_PREFERENCE "}", VAR_CMDLINE, VARE_WANTRES, &prefs); /* TODO: handle errors */ /* XXX: This should use a local list instead of opts.makefiles * since these makefiles do not come from the command line. They * also have different semantics in that only the first file that * is found is processed. See ReadAllMakefiles. */ - (void)str2Lst_Append(opts.makefiles, prefs); + (void)str2Lst_Append(&opts.makefiles, prefs); - for (ln = opts.makefiles->first; ln != NULL; ln = ln->next) + for (ln = opts.makefiles.first; ln != NULL; ln = ln->next) if (ReadMakefile(ln->datum) == 0) break; free(prefs); } -/* Initialize variables such as MAKE, MACHINE, .MAKEFLAGS. +/* + * Initialize variables such as MAKE, MACHINE, .MAKEFLAGS. * Initialize a few modules. - * Parse the arguments from MAKEFLAGS and the command line. */ + * Parse the arguments from MAKEFLAGS and the command line. + */ static void main_Init(int argc, char **argv) { struct stat sa; const char *machine; const char *machine_arch; char *syspath = getenv("MAKESYSPATH"); struct utsname utsname; /* default to writing debug to stderr */ opts.debug_file = stderr; HashTable_Init(&cached_realpaths); #ifdef SIGINFO (void)bmake_signal(SIGINFO, siginfo); #endif InitRandom(); - if ((progname = strrchr(argv[0], '/')) != NULL) - progname++; - else - progname = argv[0]; + progname = str_basename(argv[0]); UnlimitFiles(); if (uname(&utsname) == -1) { (void)fprintf(stderr, "%s: uname failed (%s).\n", progname, strerror(errno)); exit(2); } /* * Get the name of this type of MACHINE from utsname * so we can share an executable for similar machines. * (i.e. m68k: amiga hp300, mac68k, sun3, ...) * * Note that both MACHINE and MACHINE_ARCH are decided at * run-time. */ machine = InitVarMachine(&utsname); machine_arch = InitVarMachineArch(); myPid = getpid(); /* remember this for vFork() */ /* * Just in case MAKEOBJDIR wants us to do something tricky. */ Targ_Init(); Var_Init(); Var_Set(".MAKE.OS", utsname.sysname, VAR_GLOBAL); Var_Set("MACHINE", machine, VAR_GLOBAL); Var_Set("MACHINE_ARCH", machine_arch, VAR_GLOBAL); #ifdef MAKE_VERSION Var_Set("MAKE_VERSION", MAKE_VERSION, VAR_GLOBAL); #endif Var_Set(".newline", "\n", VAR_GLOBAL); /* handy for :@ loops */ /* * This is the traditional preference for makefiles. */ #ifndef MAKEFILE_PREFERENCE_LIST # define MAKEFILE_PREFERENCE_LIST "makefile Makefile" #endif Var_Set(MAKE_MAKEFILE_PREFERENCE, MAKEFILE_PREFERENCE_LIST, VAR_GLOBAL); Var_Set(MAKE_DEPENDFILE, ".depend", VAR_GLOBAL); CmdOpts_Init(); allPrecious = FALSE; /* Remove targets when interrupted */ deleteOnError = FALSE; /* Historical default behavior */ jobsRunning = FALSE; maxJobTokens = opts.maxJobs; ignorePWD = FALSE; /* * Initialize the parsing, directory and variable modules to prepare * for the reading of inclusion paths and variable settings on the * command line */ /* * Initialize various variables. * MAKE also gets this name, for compatibility * .MAKEFLAGS gets set to the empty string just in case. * MFLAGS also gets initialized empty, for compatibility. */ Parse_Init(); InitVarMake(argv[0]); Var_Set(MAKEFLAGS, "", VAR_GLOBAL); Var_Set(MAKEOVERRIDES, "", VAR_GLOBAL); Var_Set("MFLAGS", "", VAR_GLOBAL); Var_Set(".ALLTARGETS", "", VAR_GLOBAL); /* some makefiles need to know this */ Var_Set(MAKE_LEVEL ".ENV", MAKE_LEVEL_ENV, VAR_CMDLINE); /* Set some other useful variables. */ { char tmp[64], *ep = getenv(MAKE_LEVEL_ENV); makelevel = ep != NULL && ep[0] != '\0' ? atoi(ep) : 0; if (makelevel < 0) makelevel = 0; snprintf(tmp, sizeof tmp, "%d", makelevel); Var_Set(MAKE_LEVEL, tmp, VAR_GLOBAL); snprintf(tmp, sizeof tmp, "%u", myPid); Var_Set(".MAKE.PID", tmp, VAR_GLOBAL); snprintf(tmp, sizeof tmp, "%u", getppid()); Var_Set(".MAKE.PPID", tmp, VAR_GLOBAL); + snprintf(tmp, sizeof tmp, "%u", getuid()); + Var_Set(".MAKE.UID", tmp, VAR_GLOBAL); + snprintf(tmp, sizeof tmp, "%u", getgid()); + Var_Set(".MAKE.GID", tmp, VAR_GLOBAL); } if (makelevel > 0) { char pn[1024]; snprintf(pn, sizeof pn, "%s[%d]", progname, makelevel); progname = bmake_strdup(pn); } #ifdef USE_META meta_init(); #endif Dir_Init(); /* * First snag any flags out of the MAKE environment variable. * (Note this is *not* MAKEFLAGS since /bin/make uses that and it's * in a different format). */ #ifdef POSIX { char *p1 = explode(getenv("MAKEFLAGS")); Main_ParseArgLine(p1); free(p1); } #else Main_ParseArgLine(getenv("MAKE")); #endif /* * Find where we are (now). * We take care of PWD for the automounter below... */ if (getcwd(curdir, MAXPATHLEN) == NULL) { (void)fprintf(stderr, "%s: getcwd: %s.\n", progname, strerror(errno)); exit(2); } MainParseArgs(argc, argv); if (opts.enterFlag) printf("%s: Entering directory `%s'\n", progname, curdir); /* * Verify that cwd is sane. */ if (stat(curdir, &sa) == -1) { (void)fprintf(stderr, "%s: %s: %s.\n", progname, curdir, strerror(errno)); exit(2); } #ifndef NO_PWD_OVERRIDE HandlePWD(&sa); #endif Var_Set(".CURDIR", curdir, VAR_GLOBAL); InitObjdir(machine, machine_arch); /* * Initialize archive, target and suffix modules in preparation for * parsing the makefile(s) */ Arch_Init(); Suff_Init(); Trace_Init(tracefile); defaultNode = NULL; (void)time(&now); Trace_Log(MAKESTART, NULL); InitVarTargets(); InitDefSysIncPath(syspath); } -/* Read the system makefile followed by either makefile, Makefile or the - * files given by the -f option. Exit on parse errors. */ +/* + * Read the system makefile followed by either makefile, Makefile or the + * files given by the -f option. Exit on parse errors. + */ static void main_ReadFiles(void) { if (!opts.noBuiltins) ReadBuiltinRules(); - if (!Lst_IsEmpty(opts.makefiles)) - ReadAllMakefiles(opts.makefiles); + if (!Lst_IsEmpty(&opts.makefiles)) + ReadAllMakefiles(&opts.makefiles); else ReadFirstDefaultMakefile(); } /* Compute the dependency graph. */ static void main_PrepareMaking(void) { /* In particular suppress .depend for '-r -V .OBJDIR -f /dev/null' */ if (!opts.noBuiltins || opts.printVars == PVM_NONE) { - /* ignore /dev/null and anything starting with "no" */ - (void)Var_Subst("${.MAKE.DEPENDFILE:N/dev/null:Nno*:T}", + (void)Var_Subst("${.MAKE.DEPENDFILE}", VAR_CMDLINE, VARE_WANTRES, &makeDependfile); if (makeDependfile[0] != '\0') { /* TODO: handle errors */ doing_depend = TRUE; (void)ReadMakefile(makeDependfile); doing_depend = FALSE; } } if (enterFlagObj) printf("%s: Entering directory `%s'\n", progname, objdir); - MakeMode(NULL); + MakeMode(); { - void *freeIt; - Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &freeIt), - VAR_GLOBAL); - bmake_free(freeIt); + FStr makeflags = Var_Value(MAKEFLAGS, VAR_GLOBAL); + Var_Append("MFLAGS", makeflags.str, VAR_GLOBAL); + FStr_Done(&makeflags); } InitMaxJobs(); /* * Be compatible if the user did not specify -j and did not explicitly * turn compatibility on. */ if (!opts.compatMake && !forceJobs) opts.compatMake = TRUE; if (!opts.compatMake) Job_ServerStart(maxJobTokens, jp_0, jp_1); DEBUG5(JOB, "job_pipe %d %d, maxjobs %d, tokens %d, compat %d\n", jp_0, jp_1, opts.maxJobs, maxJobTokens, opts.compatMake ? 1 : 0); if (opts.printVars == PVM_NONE) Main_ExportMAKEFLAGS(TRUE); /* initial export */ InitVpath(); /* * Now that all search paths have been read for suffixes et al, it's * time to add the default search path to their lists... */ Suff_DoPaths(); /* * Propagate attributes through :: dependency lists. */ Targ_Propagate(); /* print the initial graph, if the user requested it */ if (DEBUG(GRAPH1)) Targ_PrintGraph(1); } -/* Make the targets. +/* + * Make the targets. * If the -v or -V options are given, print variables instead. - * Return whether any of the targets is out-of-date. */ + * Return whether any of the targets is out-of-date. + */ static Boolean main_Run(void) { if (opts.printVars != PVM_NONE) { /* print the values of any variables requested by the user */ doPrintVars(); return FALSE; } else { return runTargets(); } } /* Clean up after making the targets. */ static void main_CleanUp(void) { #ifdef CLEANUP - Lst_Destroy(opts.variables, free); - Lst_Free(opts.makefiles); /* don't free, may be used in GNodes */ - Lst_Destroy(opts.create, free); + Lst_DoneCall(&opts.variables, free); + /* + * Don't free the actual strings from opts.makefiles, they may be + * used in GNodes. + */ + Lst_Done(&opts.makefiles); + Lst_DoneCall(&opts.create, free); #endif /* print the graph now it's been processed if the user requested it */ if (DEBUG(GRAPH2)) Targ_PrintGraph(2); Trace_Log(MAKEEND, NULL); if (enterFlagObj) printf("%s: Leaving directory `%s'\n", progname, objdir); if (opts.enterFlag) printf("%s: Leaving directory `%s'\n", progname, curdir); #ifdef USE_META meta_finish(); #endif Suff_End(); Targ_End(); Arch_End(); Var_End(); Parse_End(); Dir_End(); Job_End(); Trace_End(); } /* Determine the exit code. */ static int main_Exit(Boolean outOfDate) { - if (opts.lint && (errors > 0 || Parse_GetFatals() > 0)) + if (opts.strict && (main_errors > 0 || Parse_GetFatals() > 0)) return 2; /* Not 1 so -q can distinguish error */ return outOfDate ? 1 : 0; } int main(int argc, char **argv) { Boolean outOfDate; main_Init(argc, argv); main_ReadFiles(); main_PrepareMaking(); outOfDate = main_Run(); main_CleanUp(); return main_Exit(outOfDate); } -/* Open and parse the given makefile, with all its side effects. +/* + * Open and parse the given makefile, with all its side effects. * * Results: * 0 if ok. -1 if couldn't open file. */ static int ReadMakefile(const char *fname) { int fd; char *name, *path = NULL; if (strcmp(fname, "-") == 0) { Parse_File(NULL /*stdin*/, -1); Var_Set("MAKEFILE", "", VAR_INTERNAL); } else { /* if we've chdir'd, rebuild the path name */ if (strcmp(curdir, objdir) != 0 && *fname != '/') { path = str_concat3(curdir, "/", fname); fd = open(path, O_RDONLY); if (fd != -1) { fname = path; goto found; } free(path); /* If curdir failed, try objdir (ala .depend) */ path = str_concat3(objdir, "/", fname); fd = open(path, O_RDONLY); if (fd != -1) { fname = path; goto found; } } else { fd = open(fname, O_RDONLY); if (fd != -1) goto found; } /* look in -I and system include directories. */ name = Dir_FindFile(fname, parseIncPath); if (name == NULL) { SearchPath *sysInc = Lst_IsEmpty(sysIncPath) ? defSysIncPath : sysIncPath; name = Dir_FindFile(fname, sysInc); } if (name == NULL || (fd = open(name, O_RDONLY)) == -1) { free(name); free(path); return -1; } fname = name; /* * set the MAKEFILE variable desired by System V fans -- the * placement of the setting here means it gets set to the last * makefile specified, as it is set by SysV make. */ found: if (!doing_depend) Var_Set("MAKEFILE", fname, VAR_INTERNAL); Parse_File(fname, fd); } free(path); return 0; } /*- * Cmd_Exec -- * Execute the command in cmd, and return the output of that command * in a string. In the output, newlines are replaced with spaces. * * Results: * A string containing the output of the command, or the empty string. * *errfmt returns a format string describing the command failure, * if any, using a single %s conversion specification. * * Side Effects: * The string must be freed by the caller. */ char * Cmd_Exec(const char *cmd, const char **errfmt) { const char *args[4]; /* Args for invoking the shell */ - int fds[2]; /* Pipe streams */ + int pipefds[2]; int cpid; /* Child PID */ int pid; /* PID from wait() */ int status; /* command exit status */ Buffer buf; /* buffer to store the result */ ssize_t bytes_read; char *res; /* result */ size_t res_len; char *cp; int savederr; /* saved errno */ *errfmt = NULL; - if (!shellName) + if (shellName == NULL) Shell_Init(); /* * Set up arguments for shell */ args[0] = shellName; args[1] = "-c"; args[2] = cmd; args[3] = NULL; /* * Open a pipe for fetching its output */ - if (pipe(fds) == -1) { + if (pipe(pipefds) == -1) { *errfmt = "Couldn't create pipe for \"%s\""; goto bad; } + Var_ReexportVars(); + /* * Fork */ switch (cpid = vFork()) { case 0: - (void)close(fds[0]); /* Close input side of pipe */ + (void)close(pipefds[0]); /* Close input side of pipe */ /* * Duplicate the output stream to the shell's output, then * shut the extra thing down. Note we don't fetch the error * stream...why not? Why? */ - (void)dup2(fds[1], 1); - (void)close(fds[1]); - - Var_ExportVars(); + (void)dup2(pipefds[1], 1); + (void)close(pipefds[1]); (void)execv(shellPath, UNCONST(args)); _exit(1); /*NOTREACHED*/ case -1: *errfmt = "Couldn't exec \"%s\""; goto bad; default: - (void)close(fds[1]); /* No need for the writing half */ + (void)close(pipefds[1]); /* No need for the writing half */ savederr = 0; Buf_Init(&buf); do { char result[BUFSIZ]; - bytes_read = read(fds[0], result, sizeof result); + bytes_read = read(pipefds[0], result, sizeof result); if (bytes_read > 0) Buf_AddBytes(&buf, result, (size_t)bytes_read); } while (bytes_read > 0 || (bytes_read == -1 && errno == EINTR)); if (bytes_read == -1) savederr = errno; - (void)close( - fds[0]); /* Close the input side of the pipe. */ + (void)close(pipefds[0]); /* Close the input side of the pipe. */ /* Wait for the process to exit. */ while ((pid = waitpid(cpid, &status, 0)) != cpid && pid >= 0) JobReapChild(pid, status, FALSE); res_len = Buf_Len(&buf); res = Buf_Destroy(&buf, FALSE); if (savederr != 0) *errfmt = "Couldn't read shell's output for \"%s\""; if (WIFSIGNALED(status)) *errfmt = "\"%s\" exited on a signal"; else if (WEXITSTATUS(status) != 0) *errfmt = "\"%s\" returned non-zero status"; /* Convert newlines to spaces. A final newline is just stripped */ if (res_len > 0 && res[res_len - 1] == '\n') res[res_len - 1] = '\0'; for (cp = res; *cp != '\0'; cp++) if (*cp == '\n') *cp = ' '; break; } return res; bad: return bmake_strdup(""); } -/* Print a printf-style error message. +/* + * Print a printf-style error message. * * In default mode, this error message has no consequences, in particular it - * does not affect the exit status. Only in lint mode (-dL) it does. */ + * does not affect the exit status. Only in lint mode (-dL) it does. + */ void Error(const char *fmt, ...) { va_list ap; FILE *err_file; err_file = opts.debug_file; if (err_file == stdout) err_file = stderr; (void)fflush(stdout); for (;;) { va_start(ap, fmt); fprintf(err_file, "%s: ", progname); (void)vfprintf(err_file, fmt, ap); va_end(ap); (void)fprintf(err_file, "\n"); (void)fflush(err_file); if (err_file == stderr) break; err_file = stderr; } - errors++; + main_errors++; } -/* Wait for any running jobs to finish, then produce an error message, +/* + * Wait for any running jobs to finish, then produce an error message, * finally exit immediately. * * Exiting immediately differs from Parse_Error, which exits only after the - * current top-level makefile has been parsed completely. */ + * current top-level makefile has been parsed completely. + */ void Fatal(const char *fmt, ...) { va_list ap; if (jobsRunning) Job_Wait(); (void)fflush(stdout); va_start(ap, fmt); (void)vfprintf(stderr, fmt, ap); va_end(ap); (void)fprintf(stderr, "\n"); (void)fflush(stderr); PrintOnError(NULL, NULL); if (DEBUG(GRAPH2) || DEBUG(GRAPH3)) Targ_PrintGraph(2); Trace_Log(MAKEERROR, NULL); exit(2); /* Not 1 so -q can distinguish error */ } -/* Major exception once jobs are being created. - * Kills all jobs, prints a message and exits. */ +/* + * Major exception once jobs are being created. + * Kills all jobs, prints a message and exits. + */ void Punt(const char *fmt, ...) { va_list ap; va_start(ap, fmt); (void)fflush(stdout); (void)fprintf(stderr, "%s: ", progname); (void)vfprintf(stderr, fmt, ap); va_end(ap); (void)fprintf(stderr, "\n"); (void)fflush(stderr); PrintOnError(NULL, NULL); DieHorribly(); } /* Exit without giving a message. */ void DieHorribly(void) { if (jobsRunning) Job_AbortAll(); if (DEBUG(GRAPH2)) Targ_PrintGraph(2); Trace_Log(MAKEERROR, NULL); - exit(2); /* Not 1, so -q can distinguish error */ + exit(2); /* Not 1 so -q can distinguish error */ } -/* Called when aborting due to errors in child shell to signal abnormal exit. +/* + * Called when aborting due to errors in child shell to signal abnormal exit. * The program exits. - * Errors is the number of errors encountered in Make_Make. */ + * Errors is the number of errors encountered in Make_Make. + */ void Finish(int errs) { if (shouldDieQuietly(NULL, -1)) exit(2); Fatal("%d error%s", errs, errs == 1 ? "" : "s"); } /* * eunlink -- * Remove a file carefully, avoiding directories. */ int eunlink(const char *file) { struct stat st; if (lstat(file, &st) == -1) return -1; if (S_ISDIR(st.st_mode)) { errno = EISDIR; return -1; } return unlink(file); } static void write_all(int fd, const void *data, size_t n) { const char *mem = data; while (n > 0) { ssize_t written = write(fd, mem, n); if (written == -1 && errno == EAGAIN) continue; if (written == -1) break; mem += written; n -= (size_t)written; } } /* * execDie -- * Print why exec failed, avoiding stdio. */ void MAKE_ATTR_DEAD execDie(const char *af, const char *av) { Buffer buf; Buf_Init(&buf); Buf_AddStr(&buf, progname); Buf_AddStr(&buf, ": "); Buf_AddStr(&buf, af); Buf_AddStr(&buf, "("); Buf_AddStr(&buf, av); Buf_AddStr(&buf, ") failed ("); Buf_AddStr(&buf, strerror(errno)); Buf_AddStr(&buf, ")\n"); write_all(STDERR_FILENO, Buf_GetAll(&buf, NULL), Buf_Len(&buf)); Buf_Destroy(&buf, TRUE); _exit(1); } /* purge any relative paths */ static void purge_relative_cached_realpaths(void) { HashEntry *he, *nhe; HashIter hi; HashIter_Init(&hi, &cached_realpaths); he = HashIter_Next(&hi); while (he != NULL) { nhe = HashIter_Next(&hi); if (he->key[0] != '/') { DEBUG1(DIR, "cached_realpath: purging %s\n", he->key); HashTable_DeleteEntry(&cached_realpaths, he); /* XXX: What about the allocated he->value? Either * free them or document why they cannot be freed. */ } he = nhe; } } char * cached_realpath(const char *pathname, char *resolved) { const char *rp; if (pathname == NULL || pathname[0] == '\0') return NULL; rp = HashTable_FindValue(&cached_realpaths, pathname); if (rp != NULL) { /* a hit */ strncpy(resolved, rp, MAXPATHLEN); resolved[MAXPATHLEN - 1] = '\0'; return resolved; } rp = realpath(pathname, resolved); if (rp != NULL) { HashTable_Set(&cached_realpaths, pathname, bmake_strdup(rp)); DEBUG2(DIR, "cached_realpath: %s -> %s\n", pathname, rp); return resolved; } /* should we negative-cache? */ return NULL; } /* * Return true if we should die without noise. * For example our failing child was a sub-make or failure happened elsewhere. */ Boolean shouldDieQuietly(GNode *gn, int bf) { static int quietly = -1; if (quietly < 0) { if (DEBUG(JOB) || !GetBooleanVar(".MAKE.DIE_QUIETLY", TRUE)) quietly = 0; else if (bf >= 0) quietly = bf; else - quietly = gn != NULL && (gn->type & OP_MAKE); + quietly = (gn != NULL && (gn->type & OP_MAKE)) ? 1 : 0; } return quietly; } static void SetErrorVars(GNode *gn) { StringListNode *ln; /* * We can print this even if there is no .ERROR target. */ Var_Set(".ERROR_TARGET", gn->name, VAR_GLOBAL); Var_Delete(".ERROR_CMD", VAR_GLOBAL); - for (ln = gn->commands->first; ln != NULL; ln = ln->next) { + for (ln = gn->commands.first; ln != NULL; ln = ln->next) { const char *cmd = ln->datum; if (cmd == NULL) break; Var_Append(".ERROR_CMD", cmd, VAR_GLOBAL); } } -/* Print some helpful information in case of an error. - * The caller should exit soon after calling this function. */ +/* + * Print some helpful information in case of an error. + * The caller should exit soon after calling this function. + */ void PrintOnError(GNode *gn, const char *msg) { static GNode *errorNode = NULL; if (DEBUG(HASH)) { Targ_Stats(); Var_Stats(); } - /* we generally want to keep quiet if a sub-make died */ - if (shouldDieQuietly(gn, -1)) - return; + if (errorNode != NULL) + return; /* we've been here! */ if (msg != NULL) printf("%s", msg); printf("\n%s: stopped in %s\n", progname, curdir); - if (errorNode != NULL) - return; /* we've been here! */ + /* we generally want to keep quiet if a sub-make died */ + if (shouldDieQuietly(gn, -1)) + return; if (gn != NULL) SetErrorVars(gn); { char *errorVarsValues; (void)Var_Subst("${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'\n@}", VAR_GLOBAL, VARE_WANTRES, &errorVarsValues); /* TODO: handle errors */ printf("%s", errorVarsValues); free(errorVarsValues); } fflush(stdout); /* * Finally, see if there is a .ERROR target, and run it if so. */ errorNode = Targ_FindNode(".ERROR"); if (errorNode != NULL) { errorNode->type |= OP_SPECIAL; Compat_Make(errorNode, errorNode); } } void Main_ExportMAKEFLAGS(Boolean first) { static Boolean once = TRUE; const char *expr; char *s; if (once != first) return; once = FALSE; expr = "${.MAKEFLAGS} ${.MAKEOVERRIDES:O:u:@v@$v=${$v:Q}@}"; (void)Var_Subst(expr, VAR_CMDLINE, VARE_WANTRES, &s); /* TODO: handle errors */ if (s[0] != '\0') { #ifdef POSIX setenv("MAKEFLAGS", s, 1); #else setenv("MAKE", s, 1); #endif } } char * getTmpdir(void) { static char *tmpdir = NULL; struct stat st; if (tmpdir != NULL) return tmpdir; /* Honor $TMPDIR but only if it is valid. Ensure it ends with '/'. */ (void)Var_Subst("${TMPDIR:tA:U" _PATH_TMP "}/", VAR_GLOBAL, VARE_WANTRES, &tmpdir); /* TODO: handle errors */ if (stat(tmpdir, &st) < 0 || !S_ISDIR(st.st_mode)) { free(tmpdir); tmpdir = bmake_strdup(_PATH_TMP); } return tmpdir; } /* * Create and open a temp file using "pattern". * If out_fname is provided, set it to a copy of the filename created. * Otherwise unlink the file once open. */ int mkTempFile(const char *pattern, char **out_fname) { static char *tmpdir = NULL; char tfile[MAXPATHLEN]; int fd; if (pattern == NULL) pattern = TMPPAT; if (tmpdir == NULL) tmpdir = getTmpdir(); if (pattern[0] == '/') { snprintf(tfile, sizeof tfile, "%s", pattern); } else { snprintf(tfile, sizeof tfile, "%s%s", tmpdir, pattern); } if ((fd = mkstemp(tfile)) < 0) Punt("Could not create temporary file %s: %s", tfile, strerror(errno)); - if (out_fname) { + if (out_fname != NULL) { *out_fname = bmake_strdup(tfile); } else { - unlink( - tfile); /* we just want the descriptor */ + unlink(tfile); /* we just want the descriptor */ } return fd; } /* * Convert a string representation of a boolean into a boolean value. * Anything that looks like "No", "False", "Off", "0" etc. is FALSE, * the empty string is the fallback, everything else is TRUE. */ Boolean ParseBoolean(const char *s, Boolean fallback) { char ch = ch_tolower(s[0]); if (ch == '\0') return fallback; if (ch == '0' || ch == 'f' || ch == 'n') return FALSE; if (ch == 'o') return ch_tolower(s[1]) != 'f'; return TRUE; } diff --git a/make-conf.h b/make-conf.h index bc3b9e7e4915..dcf5b3162dea 100644 --- a/make-conf.h +++ b/make-conf.h @@ -1,163 +1,149 @@ -/* $NetBSD: config.h,v 1.25 2020/10/19 23:43:55 rillig Exp $ */ +/* $NetBSD: config.h,v 1.28 2020/12/11 22:53:08 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)config.h 8.1 (Berkeley) 6/6/93 */ /* * Copyright (c) 1988, 1989 by Adam de Boor * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)config.h 8.1 (Berkeley) 6/6/93 */ -/* - * DEFMAXJOBS - * DEFMAXLOCAL - * These control the default concurrency. On no occasion will more - * than DEFMAXJOBS targets be created at once (locally or remotely). - * - * DEFMAXLOCAL is the highest number of targets which will be - * created on the local machine at once. Note that if you set this - * to 0, nothing will ever happen. - */ -#define DEFMAXJOBS 4 -#define DEFMAXLOCAL 1 - /* * INCLUDES * LIBRARIES * These control the handling of the .INCLUDES and .LIBS variables. * * If INCLUDES is defined, the .INCLUDES variable will be filled * from the search paths of those suffixes which are marked by * .INCLUDES dependency lines. Similarly for LIBRARIES and .LIBS. * * See varname-dot-include.mk and varname-dot-libs.mk for more details. */ #define INCLUDES #define LIBRARIES /* * LIBSUFF * Is the suffix used to denote libraries and is used by the Suff module * to find the search path on which to seek any -l targets. */ -#define LIBSUFF ".a" +#define LIBSUFF ".a" /* * RECHECK * If defined, Make_Update will check a target for its current * modification time after it has been re-made, setting it to the * starting time of the make only if the target still doesn't exist. * * Unfortunately, under NFS the modification time often doesn't * get updated in time, so a target will appear to not have been * re-made, causing later targets to appear up-to-date. * * On systems that don't have this problem, you should define this. * Under NFS you probably should not, unless you aren't exporting jobs. */ -#define RECHECK +#define RECHECK /* * POSIX * Adhere to the POSIX 1003.2 draft for the make(1) program. * - Use MAKEFLAGS instead of MAKE to pick arguments from the * environment. - * - Allow empty command lines if starting with tab. */ #define POSIX /* * SYSVINCLUDE * Recognize system V like include directives [include "filename"] * (required by POSIX 2018) * SYSVVARSUB * Recognize system V like ${VAR:x=y} variable substitutions * (required by POSIX 2018) */ #define SYSVINCLUDE #define SYSVVARSUB /* * GMAKEEXPORT * Recognize gmake like variable export directives [export =] */ #define GMAKEEXPORT /* * SUNSHCMD * Recognize SunOS and Solaris: * VAR :sh= CMD # Assign VAR to the command substitution of CMD * ${VAR:sh} # Return the command substitution of the value * # of ${VAR} */ #define SUNSHCMD #if defined(MAKE_NATIVE) && !defined(__ELF__) # ifndef RANLIBMAG # define RANLIBMAG "__.SYMDEF" # endif #endif diff --git a/make.1 b/make.1 index a18c44442b49..c711b38a9731 100644 --- a/make.1 +++ b/make.1 @@ -1,2463 +1,2469 @@ -.\" $NetBSD: make.1,v 1.292 2020/11/14 22:19:13 rillig Exp $ +.\" $NetBSD: make.1,v 1.295 2020/12/23 13:49:12 rillig Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd November 14, 2020 +.Dd December 22, 2020 .Dt MAKE 1 .Os .Sh NAME .Nm make .Nd maintain program dependencies .Sh SYNOPSIS .Nm .Op Fl BeikNnqrSstWwX .Op Fl C Ar directory .Op Fl D Ar variable .Op Fl d Ar flags .Op Fl f Ar makefile .Op Fl I Ar directory .Op Fl J Ar private .Op Fl j Ar max_jobs .Op Fl m Ar directory .Op Fl T Ar file .Op Fl V Ar variable .Op Fl v Ar variable .Op Ar variable=value .Op Ar target ... .Sh DESCRIPTION .Nm is a program designed to simplify the maintenance of other programs. Its input is a list of specifications as to the files upon which programs and other files depend. If no .Fl f Ar makefile makefile option is given, .Nm will try to open .Ql Pa makefile then .Ql Pa Makefile in order to find the specifications. If the file .Ql Pa .depend exists, it is read (see .Xr mkdep 1 ) . .Pp This manual page is intended as a reference document only. For a more thorough description of .Nm and makefiles, please refer to .%T "PMake \- A Tutorial" . .Pp .Nm will prepend the contents of the .Va MAKEFLAGS environment variable to the command line arguments before parsing them. .Pp The options are as follows: .Bl -tag -width Ds .It Fl B Try to be backwards compatible by executing a single shell per command and by executing the commands to make the sources of a dependency line in sequence. .It Fl C Ar directory Change to .Ar directory before reading the makefiles or doing anything else. If multiple .Fl C options are specified, each is interpreted relative to the previous one: .Fl C Pa / Fl C Pa etc is equivalent to .Fl C Pa /etc . .It Fl D Ar variable Define .Ar variable to be 1, in the global context. .It Fl d Ar [-]flags Turn on debugging, and specify which portions of .Nm are to print debugging information. Unless the flags are preceded by .Ql \- they are added to the .Va MAKEFLAGS environment variable and will be processed by any child make processes. By default, debugging information is printed to standard error, but this can be changed using the .Ar F debugging flag. The debugging output is always unbuffered; in addition, if debugging is enabled but debugging output is not directed to standard output, then the standard output is line buffered. .Ar Flags is one or more of the following: .Bl -tag -width Ds .It Ar A Print all possible debugging information; equivalent to specifying all of the debugging flags. .It Ar a Print debugging information about archive searching and caching. .It Ar C Print debugging information about current working directory. .It Ar c Print debugging information about conditional evaluation. .It Ar d Print debugging information about directory searching and caching. .It Ar e Print debugging information about failed commands and targets. .It Ar F Ns Oo Sy \&+ Oc Ns Ar filename Specify where debugging output is written. This must be the last flag, because it consumes the remainder of the argument. If the character immediately after the .Ql F flag is .Ql \&+ , then the file will be opened in append mode; otherwise the file will be overwritten. If the file name is .Ql stdout or .Ql stderr then debugging output will be written to the standard output or standard error output file descriptors respectively (and the .Ql \&+ option has no effect). Otherwise, the output will be written to the named file. If the file name ends .Ql .%d then the .Ql %d is replaced by the pid. .It Ar f Print debugging information about loop evaluation. .It Ar "g1" Print the input graph before making anything. .It Ar "g2" Print the input graph after making everything, or before exiting on error. .It Ar "g3" Print the input graph before exiting on error. .It Ar h Print debugging information about hash table operations. .It Ar j Print debugging information about running multiple shells. .It Ar L Turn on lint checks. This will throw errors for variable assignments that do not parse correctly, at the time of assignment so the file and line number are available. .It Ar l Print commands in Makefiles regardless of whether or not they are prefixed by .Ql @ or other "quiet" flags. Also known as "loud" behavior. .It Ar M Print debugging information about "meta" mode decisions about targets. .It Ar m Print debugging information about making targets, including modification dates. .It Ar n Don't delete the temporary command scripts created when running commands. These temporary scripts are created in the directory referred to by the .Ev TMPDIR environment variable, or in .Pa /tmp if .Ev TMPDIR is unset or set to the empty string. The temporary scripts are created by .Xr mkstemp 3 , and have names of the form .Pa makeXXXXXX . .Em NOTE : This can create many files in .Ev TMPDIR or .Pa /tmp , so use with care. .It Ar p Print debugging information about makefile parsing. .It Ar s Print debugging information about suffix-transformation rules. .It Ar t Print debugging information about target list maintenance. .It Ar V Force the .Fl V option to print raw values of variables, overriding the default behavior set via .Va .MAKE.EXPAND_VARIABLES . .It Ar v Print debugging information about variable assignment. .It Ar x Run shell commands with .Fl x so the actual commands are printed as they are executed. .El .It Fl e Specify that environment variables override macro assignments within makefiles. .It Fl f Ar makefile Specify a makefile to read instead of the default .Ql Pa makefile . If .Ar makefile is .Ql Fl , standard input is read. Multiple makefiles may be specified, and are read in the order specified. .It Fl I Ar directory Specify a directory in which to search for makefiles and included makefiles. The system makefile directory (or directories, see the .Fl m option) is automatically included as part of this list. .It Fl i Ignore non-zero exit of shell commands in the makefile. Equivalent to specifying .Ql Fl before each command line in the makefile. .It Fl J Ar private This option should .Em not be specified by the user. .Pp When the .Ar j option is in use in a recursive build, this option is passed by a make to child makes to allow all the make processes in the build to cooperate to avoid overloading the system. .It Fl j Ar max_jobs Specify the maximum number of jobs that .Nm may have running at any one time. The value is saved in .Va .MAKE.JOBS . Turns compatibility mode off, unless the .Ar B flag is also specified. When compatibility mode is off, all commands associated with a target are executed in a single shell invocation as opposed to the traditional one shell invocation per line. This can break traditional scripts which change directories on each command invocation and then expect to start with a fresh environment on the next line. It is more efficient to correct the scripts rather than turn backwards compatibility on. .It Fl k Continue processing after errors are encountered, but only on those targets that do not depend on the target whose creation caused the error. .It Fl m Ar directory Specify a directory in which to search for sys.mk and makefiles included via the .Li \&< Ns Ar file Ns Li \&> Ns -style include statement. The .Fl m option can be used multiple times to form a search path. This path will override the default system include path: /usr/share/mk. Furthermore the system include path will be appended to the search path used for .Li \*q Ns Ar file Ns Li \*q Ns -style include statements (see the .Fl I option). .Pp If a file or directory name in the .Fl m argument (or the .Ev MAKESYSPATH environment variable) starts with the string .Qq \&.../ then .Nm will search for the specified file or directory named in the remaining part of the argument string. The search starts with the current directory of the Makefile and then works upward towards the root of the file system. If the search is successful, then the resulting directory replaces the .Qq \&.../ specification in the .Fl m argument. If used, this feature allows .Nm to easily search in the current source tree for customized sys.mk files (e.g., by using .Qq \&.../mk/sys.mk as an argument). .It Fl n Display the commands that would have been executed, but do not actually execute them unless the target depends on the .MAKE special source (see below) or the command is prefixed with .Ql Ic + . .It Fl N Display the commands which would have been executed, but do not actually execute any of them; useful for debugging top-level makefiles without descending into subdirectories. .It Fl q Do not execute any commands, but exit 0 if the specified targets are up-to-date and 1, otherwise. .It Fl r Do not use the built-in rules specified in the system makefile. .It Fl S Stop processing if an error is encountered. This is the default behavior and the opposite of .Fl k . .It Fl s Do not echo any commands as they are executed. Equivalent to specifying .Ql Ic @ before each command line in the makefile. .It Fl T Ar tracefile When used with the .Fl j flag, append a trace record to .Ar tracefile for each job started and completed. .It Fl t Rather than re-building a target as specified in the makefile, create it or update its modification time to make it appear up-to-date. .It Fl V Ar variable Print the value of .Ar variable . Do not build any targets. Multiple instances of this option may be specified; the variables will be printed one per line, with a blank line for each null or undefined variable. The value printed is extracted from the global context after all makefiles have been read. By default, the raw variable contents (which may include additional unexpanded variable references) are shown. If .Ar variable contains a .Ql \&$ then the value will be recursively expanded to its complete resultant text before printing. The expanded value will also be printed if .Va .MAKE.EXPAND_VARIABLES is set to true and the .Fl dV option has not been used to override it. Note that loop-local and target-local variables, as well as values taken temporarily by global variables during makefile processing, are not accessible via this option. The .Fl dv debug mode can be used to see these at the cost of generating substantial extraneous output. .It Fl v Ar variable Like .Fl V but the variable is always expanded to its complete value. .It Fl W Treat any warnings during makefile parsing as errors. .It Fl w Print entering and leaving directory messages, pre and post processing. .It Fl X Don't export variables passed on the command line to the environment individually. Variables passed on the command line are still exported via the .Va MAKEFLAGS environment variable. This option may be useful on systems which have a small limit on the size of command arguments. .It Ar variable=value Set the value of the variable .Ar variable to .Ar value . Normally, all values passed on the command line are also exported to sub-makes in the environment. The .Fl X flag disables this behavior. Variable assignments should follow options for POSIX compatibility but no ordering is enforced. .El .Pp There are seven different types of lines in a makefile: file dependency specifications, shell commands, variable assignments, include statements, conditional directives, for loops, and comments. .Pp In general, lines may be continued from one line to the next by ending them with a backslash .Pq Ql \e . The trailing newline character and initial whitespace on the following line are compressed into a single space. .Sh FILE DEPENDENCY SPECIFICATIONS Dependency lines consist of one or more targets, an operator, and zero or more sources. This creates a relationship where the targets .Dq depend on the sources and are customarily created from them. A target is considered out-of-date if it does not exist, or if its modification time is less than that of any of its sources. An out-of-date target will be re-created, but not until all sources have been examined and themselves re-created as needed. Three operators may be used: .Bl -tag -width flag .It Ic \&: Many dependency lines may name this target but only one may have attached shell commands. All sources named in all dependency lines are considered together, and if needed the attached shell commands are run to create or re-create the target. If .Nm is interrupted, the target is removed. .It Ic \&! The same, but the target is always re-created whether or not it is out of date. .It Ic \&:: Any dependency line may have attached shell commands, but each one is handled independently: its sources are considered and the attached shell commands are run if the target is out of date with respect to (only) those sources. Thus, different groups of the attached shell commands may be run depending on the circumstances. Furthermore, unlike .Ic \&:, for dependency lines with no sources, the attached shell commands are always run. Also unlike .Ic \&:, the target will not be removed if .Nm is interrupted. .El All dependency lines mentioning a particular target must use the same operator. .Pp Targets and sources may contain the shell wildcard values .Ql \&? , .Ql * , .Ql [] , and .Ql {} . The values .Ql \&? , .Ql * , and .Ql [] may only be used as part of the final component of the target or source, and must be used to describe existing files. The value .Ql {} need not necessarily be used to describe existing files. Expansion is in directory order, not alphabetically as done in the shell. .Sh SHELL COMMANDS Each target may have associated with it one or more lines of shell commands, normally used to create the target. Each of the lines in this script .Em must be preceded by a tab. (For historical reasons, spaces are not accepted.) While targets can appear in many dependency lines if desired, by default only one of these rules may be followed by a creation script. If the .Ql Ic \&:: operator is used, however, all rules may include scripts and the scripts are executed in the order found. .Pp Each line is treated as a separate shell command, unless the end of line is escaped with a backslash .Pq Ql \e in which case that line and the next are combined. .\" The escaped newline is retained and passed to the shell, which .\" normally ignores it. .\" However, the tab at the beginning of the following line is removed. If the first characters of the command are any combination of .Ql Ic @ , .Ql Ic + , or .Ql Ic \- , the command is treated specially. A .Ql Ic @ causes the command not to be echoed before it is executed. A .Ql Ic + causes the command to be executed even when .Fl n is given. This is similar to the effect of the .MAKE special source, except that the effect can be limited to a single line of a script. A .Ql Ic \- in compatibility mode causes any non-zero exit status of the command line to be ignored. .Pp When .Nm is run in jobs mode with .Fl j Ar max_jobs , the entire script for the target is fed to a single instance of the shell. In compatibility (non-jobs) mode, each command is run in a separate process. If the command contains any shell meta characters .Pq Ql #=|^(){};&<>*?[]:$`\e\en it will be passed to the shell; otherwise .Nm will attempt direct execution. If a line starts with .Ql Ic \- and the shell has ErrCtl enabled then failure of the command line will be ignored as in compatibility mode. Otherwise .Ql Ic \- affects the entire job; the script will stop at the first command line that fails, but the target will not be deemed to have failed. .Pp Makefiles should be written so that the mode of .Nm operation does not change their behavior. For example, any command which needs to use .Dq cd or .Dq chdir without potentially changing the directory for subsequent commands should be put in parentheses so it executes in a subshell. To force the use of one shell, escape the line breaks so as to make the whole script one command. For example: .Bd -literal -offset indent avoid-chdir-side-effects: @echo Building $@ in `pwd` @(cd ${.CURDIR} && ${MAKE} $@) @echo Back in `pwd` ensure-one-shell-regardless-of-mode: @echo Building $@ in `pwd`; \e (cd ${.CURDIR} && ${MAKE} $@); \e echo Back in `pwd` .Ed .Pp Since .Nm will .Xr chdir 2 to .Ql Va .OBJDIR before executing any targets, each child process starts with that as its current working directory. .Sh VARIABLE ASSIGNMENTS Variables in make are much like variables in the shell, and, by tradition, consist of all upper-case letters. .Ss Variable assignment modifiers The five operators that can be used to assign values to variables are as follows: .Bl -tag -width Ds .It Ic \&= Assign the value to the variable. Any previous value is overridden. .It Ic \&+= Append the value to the current value of the variable. .It Ic \&?= Assign the value to the variable if it is not already defined. .It Ic \&:= Assign with expansion, i.e. expand the value before assigning it to the variable. Normally, expansion is not done until the variable is referenced. .Em NOTE : References to undefined variables are .Em not expanded. This can cause problems when variable modifiers are used. .It Ic \&!= Expand the value and pass it to the shell for execution and assign the result to the variable. Any newlines in the result are replaced with spaces. .El .Pp Any white-space before the assigned .Ar value is removed; if the value is being appended, a single space is inserted between the previous contents of the variable and the appended value. .Pp Variables are expanded by surrounding the variable name with either curly braces .Pq Ql {} or parentheses .Pq Ql () and preceding it with a dollar sign .Pq Ql \&$ . If the variable name contains only a single letter, the surrounding braces or parentheses are not required. This shorter form is not recommended. .Pp If the variable name contains a dollar, then the name itself is expanded first. This allows almost arbitrary variable names, however names containing dollar, braces, parentheses, or whitespace are really best avoided! .Pp If the result of expanding a variable contains a dollar sign .Pq Ql \&$ the string is expanded again. .Pp Variable substitution occurs at three distinct times, depending on where the variable is being used. .Bl -enum .It Variables in dependency lines are expanded as the line is read. .It Variables in shell commands are expanded when the shell command is executed. .It .Dq .for loop index variables are expanded on each loop iteration. Note that other variables are not expanded inside loops so the following example code: .Bd -literal -offset indent .Dv .for i in 1 2 3 a+= ${i} j= ${i} b+= ${j} .Dv .endfor all: @echo ${a} @echo ${b} .Ed will print: .Bd -literal -offset indent 1 2 3 3 3 3 .Ed Because while ${a} contains .Dq 1 2 3 after the loop is executed, ${b} contains .Dq ${j} ${j} ${j} which expands to .Dq 3 3 3 since after the loop completes ${j} contains .Dq 3 . .El .Ss Variable classes The four different classes of variables (in order of increasing precedence) are: .Bl -tag -width Ds .It Environment variables Variables defined as part of .Nm Ns 's environment. .It Global variables Variables defined in the makefile or in included makefiles. .It Command line variables Variables defined as part of the command line. .It Local variables Variables that are defined specific to a certain target. .El .Pp Local variables are all built in and their values vary magically from target to target. It is not currently possible to define new local variables. The seven local variables are as follows: .Bl -tag -width ".ARCHIVE" -offset indent .It Va .ALLSRC The list of all sources for this target; also known as .Ql Va \&> . .It Va .ARCHIVE The name of the archive file; also known as .Ql Va \&! . .It Va .IMPSRC In suffix-transformation rules, the name/path of the source from which the target is to be transformed (the .Dq implied source); also known as .Ql Va \&< . It is not defined in explicit rules. .It Va .MEMBER The name of the archive member; also known as .Ql Va % . .It Va .OODATE The list of sources for this target that were deemed out-of-date; also known as .Ql Va \&? . .It Va .PREFIX The file prefix of the target, containing only the file portion, no suffix or preceding directory components; also known as .Ql Va * . The suffix must be one of the known suffixes declared with .Ic .SUFFIXES or it will not be recognized. .It Va .TARGET The name of the target; also known as .Ql Va @ . For compatibility with other makes this is an alias for .Ic .ARCHIVE in archive member rules. .El .Pp The shorter forms .Ql ( Va > , .Ql Va \&! , .Ql Va < , .Ql Va % , .Ql Va \&? , .Ql Va * , and .Ql Va @ ) are permitted for backward compatibility with historical makefiles and legacy POSIX make and are not recommended. .Pp Variants of these variables with the punctuation followed immediately by .Ql D or .Ql F , e.g. .Ql Va $(@D) , are legacy forms equivalent to using the .Ql :H and .Ql :T modifiers. These forms are accepted for compatibility with .At V makefiles and POSIX but are not recommended. .Pp Four of the local variables may be used in sources on dependency lines because they expand to the proper value for each target on the line. These variables are .Ql Va .TARGET , .Ql Va .PREFIX , .Ql Va .ARCHIVE , and .Ql Va .MEMBER . .Ss Additional built-in variables In addition, .Nm sets or knows about the following variables: .Bl -tag -width .MAKEOVERRIDES .It Va \&$ A single dollar sign .Ql \&$ , i.e. .Ql \&$$ expands to a single dollar sign. .It Va .ALLTARGETS The list of all targets encountered in the Makefile. If evaluated during Makefile parsing, lists only those targets encountered thus far. .It Va .CURDIR A path to the directory where .Nm was executed. Refer to the description of .Ql Ev PWD for more details. .It Va .INCLUDEDFROMDIR The directory of the file this Makefile was included from. .It Va .INCLUDEDFROMFILE The filename of the file this Makefile was included from. .It Ev MAKE The name that .Nm was executed with .Pq Va argv[0] . For compatibility .Nm also sets .Va .MAKE with the same value. The preferred variable to use is the environment variable .Ev MAKE because it is more compatible with other versions of .Nm and cannot be confused with the special target with the same name. .It Va .MAKE.DEPENDFILE Names the makefile (default .Ql Pa .depend ) from which generated dependencies are read. .It Va .MAKE.EXPAND_VARIABLES A boolean that controls the default behavior of the .Fl V option. If true, variable values printed with .Fl V are fully expanded; if false, the raw variable contents (which may include additional unexpanded variable references) are shown. .It Va .MAKE.EXPORTED The list of variables exported by .Nm . .It Va .MAKE.JOBS The argument to the .Fl j option. .It Va .MAKE.JOB.PREFIX If .Nm is run with .Ar j then output for each target is prefixed with a token .Ql --- target --- the first part of which can be controlled via .Va .MAKE.JOB.PREFIX . If .Va .MAKE.JOB.PREFIX is empty, no token is printed. .br For example: .Li .MAKE.JOB.PREFIX=${.newline}---${.MAKE:T}[${.MAKE.PID}] would produce tokens like .Ql ---make[1234] target --- making it easier to track the degree of parallelism being achieved. .It Ev MAKEFLAGS The environment variable .Ql Ev MAKEFLAGS may contain anything that may be specified on .Nm Ns 's command line. Anything specified on .Nm Ns 's command line is appended to the .Ql Ev MAKEFLAGS variable which is then entered into the environment for all programs which .Nm executes. .It Va .MAKE.LEVEL The recursion depth of .Nm . The initial instance of .Nm will be 0, and an incremented value is put into the environment to be seen by the next generation. This allows tests like: .Li .if ${.MAKE.LEVEL} == 0 to protect things which should only be evaluated in the initial instance of .Nm . .It Va .MAKE.MAKEFILE_PREFERENCE The ordered list of makefile names (default .Ql Pa makefile , .Ql Pa Makefile ) that .Nm will look for. .It Va .MAKE.MAKEFILES The list of makefiles read by .Nm , which is useful for tracking dependencies. Each makefile is recorded only once, regardless of the number of times read. .It Va .MAKE.MODE Processed after reading all makefiles. Can affect the mode that .Nm runs in. It can contain a number of keywords: .Bl -hang -width missing-filemon=bf. .It Pa compat Like .Fl B , puts .Nm into "compat" mode. .It Pa meta Puts .Nm into "meta" mode, where meta files are created for each target to capture the command run, the output generated and if .Xr filemon 4 is available, the system calls which are of interest to .Nm . The captured output can be very useful when diagnosing errors. .It Pa curdirOk= Ar bf Normally .Nm will not create .meta files in .Ql Va .CURDIR . This can be overridden by setting .Va bf to a value which represents True. .It Pa missing-meta= Ar bf If .Va bf is True, then a missing .meta file makes the target out-of-date. .It Pa missing-filemon= Ar bf If .Va bf is True, then missing filemon data makes the target out-of-date. .It Pa nofilemon Do not use .Xr filemon 4 . .It Pa env For debugging, it can be useful to include the environment in the .meta file. .It Pa verbose If in "meta" mode, print a clue about the target being built. This is useful if the build is otherwise running silently. The message printed the value of: .Va .MAKE.META.PREFIX . .It Pa ignore-cmd Some makefiles have commands which are simply not stable. This keyword causes them to be ignored for determining whether a target is out of date in "meta" mode. See also .Ic .NOMETA_CMP . .It Pa silent= Ar bf If .Va bf is True, when a .meta file is created, mark the target .Ic .SILENT . .El .It Va .MAKE.META.BAILIWICK In "meta" mode, provides a list of prefixes which match the directories controlled by .Nm . If a file that was generated outside of .Va .OBJDIR but within said bailiwick is missing, the current target is considered out-of-date. .It Va .MAKE.META.CREATED In "meta" mode, this variable contains a list of all the meta files updated. If not empty, it can be used to trigger processing of .Va .MAKE.META.FILES . .It Va .MAKE.META.FILES In "meta" mode, this variable contains a list of all the meta files used (updated or not). This list can be used to process the meta files to extract dependency information. .It Va .MAKE.META.IGNORE_PATHS Provides a list of path prefixes that should be ignored; because the contents are expected to change over time. The default list includes: .Ql Pa /dev /etc /proc /tmp /var/run /var/tmp .It Va .MAKE.META.IGNORE_PATTERNS Provides a list of patterns to match against pathnames. Ignore any that match. .It Va .MAKE.META.IGNORE_FILTER Provides a list of variable modifiers to apply to each pathname. Ignore if the expansion is an empty string. .It Va .MAKE.META.PREFIX Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: .Dl Building ${.TARGET:H:tA}/${.TARGET:T} .It Va .MAKEOVERRIDES This variable is used to record the names of variables assigned to on the command line, so that they may be exported as part of .Ql Ev MAKEFLAGS . This behavior can be disabled by assigning an empty value to .Ql Va .MAKEOVERRIDES within a makefile. Extra variables can be exported from a makefile by appending their names to .Ql Va .MAKEOVERRIDES . .Ql Ev MAKEFLAGS is re-exported whenever .Ql Va .MAKEOVERRIDES is modified. .It Va .MAKE.PATH_FILEMON If .Nm was built with .Xr filemon 4 support, this is set to the path of the device node. This allows makefiles to test for this support. .It Va .MAKE.PID The process-id of .Nm . .It Va .MAKE.PPID The parent process-id of .Nm . .It Va .MAKE.SAVE_DOLLARS value should be a boolean that controls whether .Ql $$ are preserved when doing .Ql := assignments. The default is false, for backwards compatibility. Set to true for compatability with other makes. If set to false, .Ql $$ becomes .Ql $ per normal evaluation rules. +.It Va .MAKE.UID +The user-id running +.Nm . +.It Va .MAKE.GID +The group-id running +.Nm . .It Va MAKE_PRINT_VAR_ON_ERROR When .Nm stops due to an error, it sets .Ql Va .ERROR_TARGET to the name of the target that failed, .Ql Va .ERROR_CMD to the commands of the failed target, and in "meta" mode, it also sets .Ql Va .ERROR_CWD to the .Xr getcwd 3 , and .Ql Va .ERROR_META_FILE to the path of the meta file (if any) describing the failed target. It then prints its name and the value of .Ql Va .CURDIR as well as the value of any variables named in .Ql Va MAKE_PRINT_VAR_ON_ERROR . .It Va .newline This variable is simply assigned a newline character as its value. This allows expansions using the .Cm \&:@ modifier to put a newline between iterations of the loop rather than a space. For example, the printing of .Ql Va MAKE_PRINT_VAR_ON_ERROR could be done as ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@}. .It Va .OBJDIR A path to the directory where the targets are built. Its value is determined by trying to .Xr chdir 2 to the following directories in order and using the first match: .Bl -enum .It .Ev ${MAKEOBJDIRPREFIX}${.CURDIR} .Pp (Only if .Ql Ev MAKEOBJDIRPREFIX is set in the environment or on the command line.) .It .Ev ${MAKEOBJDIR} .Pp (Only if .Ql Ev MAKEOBJDIR is set in the environment or on the command line.) .It .Ev ${.CURDIR} Ns Pa /obj. Ns Ev ${MACHINE} .It .Ev ${.CURDIR} Ns Pa /obj .It .Pa /usr/obj/ Ns Ev ${.CURDIR} .It .Ev ${.CURDIR} .El .Pp Variable expansion is performed on the value before it's used, so expressions such as .Dl ${.CURDIR:S,^/usr/src,/var/obj,} may be used. This is especially useful with .Ql Ev MAKEOBJDIR . .Pp .Ql Va .OBJDIR may be modified in the makefile via the special target .Ql Ic .OBJDIR . In all cases, .Nm will .Xr chdir 2 to the specified directory if it exists, and set .Ql Va .OBJDIR and .Ql Ev PWD to that directory before executing any targets. .Pp Except in the case of an explicit .Ql Ic .OBJDIR -target, +target, .Nm will check that the specified directory is writable and ignore it if not. This check can be skipped by setting the environment variable .Ql Ev MAKE_OBJDIR_CHECK_WRITABLE to "no". . .It Va .PARSEDIR A path to the directory of the current .Ql Pa Makefile being parsed. .It Va .PARSEFILE The basename of the current .Ql Pa Makefile being parsed. This variable and .Ql Va .PARSEDIR are both set only while the .Ql Pa Makefiles are being parsed. If you want to retain their current values, assign them to a variable using assignment with expansion: .Pq Ql Cm \&:= . .It Va .PATH A variable that represents the list of directories that .Nm will search for files. The search list should be updated using the target .Ql Va .PATH rather than the variable. .It Ev PWD Alternate path to the current directory. .Nm normally sets .Ql Va .CURDIR to the canonical path given by .Xr getcwd 3 . However, if the environment variable .Ql Ev PWD is set and gives a path to the current directory, then .Nm sets .Ql Va .CURDIR to the value of .Ql Ev PWD instead. This behavior is disabled if .Ql Ev MAKEOBJDIRPREFIX is set or .Ql Ev MAKEOBJDIR contains a variable transform. .Ql Ev PWD is set to the value of .Ql Va .OBJDIR for all programs which .Nm executes. .It Ev .SHELL The pathname of the shell used to run target scripts. It is read-only. .It Ev .TARGETS The list of targets explicitly specified on the command line, if any. .It Ev VPATH Colon-separated .Pq Dq \&: lists of directories that .Nm will search for files. The variable is supported for compatibility with old make programs only, use .Ql Va .PATH instead. .El .Ss Variable modifiers Variable expansion may be modified to select or modify each word of the variable (where a .Dq word is white-space delimited sequence of characters). The general format of a variable expansion is as follows: .Pp .Dl ${variable[:modifier[:...]]} .Pp Each modifier begins with a colon, which may be escaped with a backslash .Pq Ql \e . .Pp A set of modifiers can be specified via a variable, as follows: .Pp .Dl modifier_variable=modifier[:...] .Dl ${variable:${modifier_variable}[:...]} .Pp In this case the first modifier in the modifier_variable does not start with a colon, since that must appear in the referencing variable. If any of the modifiers in the modifier_variable contain a dollar sign .Pq Ql $ , these must be doubled to avoid early expansion. .Pp The supported modifiers are: .Bl -tag -width EEE .It Cm \&:E Replaces each word in the variable with its suffix. .It Cm \&:H Replaces each word in the variable with everything but the last component. .It Cm \&:M Ns Ar pattern Selects only those words that match .Ar pattern . The standard shell wildcard characters .Pf ( Ql * , .Ql \&? , and .Ql Oo Oc ) may be used. The wildcard characters may be escaped with a backslash .Pq Ql \e . As a consequence of the way values are split into words, matched, and then joined, a construct like .Dl ${VAR:M*} will normalize the inter-word spacing, removing all leading and trailing space, and converting multiple consecutive spaces to single spaces. . .It Cm \&:N Ns Ar pattern This is identical to .Ql Cm \&:M , but selects all words which do not match .Ar pattern . .It Cm \&:O Orders every word in variable alphabetically. .It Cm \&:Or Orders every word in variable in reverse alphabetical order. .It Cm \&:Ox Shuffles the words in variable. The results will be different each time you are referring to the modified variable; use the assignment with expansion .Pq Ql Cm \&:= to prevent such behavior. For example, .Bd -literal -offset indent LIST= uno due tre quattro RANDOM_LIST= ${LIST:Ox} STATIC_RANDOM_LIST:= ${LIST:Ox} all: @echo "${RANDOM_LIST}" @echo "${RANDOM_LIST}" @echo "${STATIC_RANDOM_LIST}" @echo "${STATIC_RANDOM_LIST}" .Ed may produce output similar to: .Bd -literal -offset indent quattro due tre uno tre due quattro uno due uno quattro tre due uno quattro tre .Ed .It Cm \&:Q Quotes every shell meta-character in the variable, so that it can be passed safely to the shell. .It Cm \&:q Quotes every shell meta-character in the variable, and also doubles .Sq $ characters so that it can be passed safely through recursive invocations of .Nm . This is equivalent to: .Sq \&:S/\e\&$/&&/g:Q . .It Cm \&:R Replaces each word in the variable with everything but its suffix. .It Cm \&:range[=count] The value is an integer sequence representing the words of the original value, or the supplied .Va count . .It Cm \&:gmtime[=utc] The value is a format string for .Xr strftime 3 , using .Xr gmtime 3 . If a .Va utc value is not provided or is 0, the current time is used. .It Cm \&:hash Computes a 32-bit hash of the value and encode it as hex digits. .It Cm \&:localtime[=utc] The value is a format string for .Xr strftime 3 , using .Xr localtime 3 . If a .Va utc value is not provided or is 0, the current time is used. .It Cm \&:tA Attempts to convert variable to an absolute path using .Xr realpath 3 , if that fails, the value is unchanged. .It Cm \&:tl Converts variable to lower-case letters. .It Cm \&:ts Ns Ar c Words in the variable are normally separated by a space on expansion. This modifier sets the separator to the character .Ar c . If .Ar c is omitted, then no separator is used. The common escapes (including octal numeric codes) work as expected. .It Cm \&:tu Converts variable to upper-case letters. .It Cm \&:tW Causes the value to be treated as a single word (possibly containing embedded white space). See also .Ql Cm \&:[*] . .It Cm \&:tw Causes the value to be treated as a sequence of words delimited by white space. See also .Ql Cm \&:[@] . .Sm off .It Cm \&:S No \&/ Ar old_string No \&/ Ar new_string No \&/ Op Cm 1gW .Sm on Modifies the first occurrence of .Ar old_string in each word of the variable's value, replacing it with .Ar new_string . If a .Ql g is appended to the last delimiter of the pattern, all occurrences in each word are replaced. If a .Ql 1 is appended to the last delimiter of the pattern, only the first occurrence is affected. If a .Ql W is appended to the last delimiter of the pattern, then the value is treated as a single word (possibly containing embedded white space). If .Ar old_string begins with a caret .Pq Ql ^ , .Ar old_string is anchored at the beginning of each word. If .Ar old_string ends with a dollar sign .Pq Ql \&$ , it is anchored at the end of each word. Inside .Ar new_string , an ampersand .Pq Ql & is replaced by .Ar old_string (without any .Ql ^ or .Ql \&$ ) . Any character may be used as a delimiter for the parts of the modifier string. The anchoring, ampersand and delimiter characters may be escaped with a backslash .Pq Ql \e . .Pp Variable expansion occurs in the normal fashion inside both .Ar old_string and .Ar new_string with the single exception that a backslash is used to prevent the expansion of a dollar sign .Pq Ql \&$ , not a preceding dollar sign as is usual. .Sm off .It Cm \&:C No \&/ Ar pattern No \&/ Ar replacement No \&/ Op Cm 1gW .Sm on The .Cm \&:C modifier is just like the .Cm \&:S modifier except that the old and new strings, instead of being simple strings, are an extended regular expression (see .Xr regex 3 ) string .Ar pattern and an .Xr ed 1 Ns \-style string .Ar replacement . Normally, the first occurrence of the pattern .Ar pattern in each word of the value is substituted with .Ar replacement . The .Ql 1 modifier causes the substitution to apply to at most one word; the .Ql g modifier causes the substitution to apply to as many instances of the search pattern .Ar pattern as occur in the word or words it is found in; the .Ql W modifier causes the value to be treated as a single word (possibly containing embedded white space). .Pp As for the .Cm \&:S modifier, the .Ar pattern and .Ar replacement are subjected to variable expansion before being parsed as regular expressions. .It Cm \&:T Replaces each word in the variable with its last path component. .It Cm \&:u Removes adjacent duplicate words (like .Xr uniq 1 ) . .Sm off .It Cm \&:\&? Ar true_string Cm \&: Ar false_string .Sm on If the variable name (not its value), when parsed as a .if conditional expression, evaluates to true, return as its value the .Ar true_string , otherwise return the .Ar false_string . Since the variable name is used as the expression, \&:\&? must be the first modifier after the variable name itself - which will, of course, usually contain variable expansions. A common error is trying to use expressions like .Dl ${NUMBERS:M42:?match:no} which actually tests defined(NUMBERS), to determine if any words match "42" you need to use something like: .Dl ${"${NUMBERS:M42}" != \&"\&":?match:no} . .It Ar :old_string=new_string This is the .At V style variable substitution. It must be the last modifier specified. If .Ar old_string or .Ar new_string do not contain the pattern matching character .Ar % then it is assumed that they are anchored at the end of each word, so only suffixes or entire words may be replaced. Otherwise .Ar % is the substring of .Ar old_string to be replaced in .Ar new_string . If only .Ar old_string contains the pattern matching character .Ar % , and .Ar old_string matches, then the result is the .Ar new_string . If only the .Ar new_string contains the pattern matching character .Ar % , then it is not treated specially and it is printed as a literal .Ar % on match. If there is more than one pattern matching character .Ar ( % ) in either the .Ar new_string or .Ar old_string , only the first instance is treated specially (as the pattern character); all subsequent instances are treated as regular characters. .Pp Variable expansion occurs in the normal fashion inside both .Ar old_string and .Ar new_string with the single exception that a backslash is used to prevent the expansion of a dollar sign .Pq Ql \&$ , not a preceding dollar sign as is usual. .Sm off .It Cm \&:@ Ar temp Cm @ Ar string Cm @ .Sm on This is the loop expansion mechanism from the OSF Development Environment (ODE) make. Unlike .Cm \&.for loops, expansion occurs at the time of reference. Assigns .Ar temp to each word in the variable and evaluates .Ar string . The ODE convention is that .Ar temp should start and end with a period. For example. .Dl ${LINKS:@.LINK.@${LN} ${TARGET} ${.LINK.}@} .Pp However a single character variable is often more readable: .Dl ${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'${.newline}@} .It Cm \&:_[=var] Saves the current variable value in .Ql $_ or the named .Va var for later reference. Example usage: .Bd -literal -offset indent M_cmpv.units = 1 1000 1000000 M_cmpv = S,., ,g:_:range:@i@+ $${_:[-$$i]} \&\\ \\* $${M_cmpv.units:[$$i]}@:S,^,expr 0 ,1:sh .Dv .if ${VERSION:${M_cmpv}} < ${3.1.12:L:${M_cmpv}} .Ed Here .Ql $_ is used to save the result of the .Ql :S modifier which is later referenced using the index values from .Ql :range . .It Cm \&:U Ns Ar newval If the variable is undefined, .Ar newval is the value. If the variable is defined, the existing value is returned. This is another ODE make feature. It is handy for setting per-target CFLAGS for instance: .Dl ${_${.TARGET:T}_CFLAGS:U${DEF_CFLAGS}} If a value is only required if the variable is undefined, use: .Dl ${VAR:D:Unewval} .It Cm \&:D Ns Ar newval If the variable is defined, .Ar newval is the value. .It Cm \&:L The name of the variable is the value. .It Cm \&:P The path of the node which has the same name as the variable is the value. If no such node exists or its path is null, then the name of the variable is used. In order for this modifier to work, the name (node) must at least have appeared on the rhs of a dependency. .Sm off .It Cm \&:\&! Ar cmd Cm \&! .Sm on The output of running .Ar cmd is the value. .It Cm \&:sh If the variable is non-empty it is run as a command and the output becomes the new value. .It Cm \&::= Ns Ar str The variable is assigned the value .Ar str after substitution. This modifier and its variations are useful in obscure situations such as wanting to set a variable when shell commands are being parsed. These assignment modifiers always expand to nothing, so if appearing in a rule line by themselves should be preceded with something to keep .Nm happy. .Pp The .Ql Cm \&:: helps avoid false matches with the .At V style .Cm \&:= modifier and since substitution always occurs the .Cm \&::= form is vaguely appropriate. .It Cm \&::?= Ns Ar str As for .Cm \&::= but only if the variable does not already have a value. .It Cm \&::+= Ns Ar str Append .Ar str to the variable. .It Cm \&::!= Ns Ar cmd Assign the output of .Ar cmd to the variable. .It Cm \&:\&[ Ns Ar range Ns Cm \&] Selects one or more words from the value, or performs other operations related to the way in which the value is divided into words. .Pp Ordinarily, a value is treated as a sequence of words delimited by white space. Some modifiers suppress this behavior, causing a value to be treated as a single word (possibly containing embedded white space). An empty value, or a value that consists entirely of white-space, is treated as a single word. For the purposes of the .Ql Cm \&:[] modifier, the words are indexed both forwards using positive integers (where index 1 represents the first word), and backwards using negative integers (where index \-1 represents the last word). .Pp The .Ar range is subjected to variable expansion, and the expanded result is then interpreted as follows: .Bl -tag -width index .\" :[n] .It Ar index Selects a single word from the value. .\" :[start..end] .It Ar start Ns Cm \&.. Ns Ar end Selects all words from .Ar start to .Ar end , inclusive. For example, .Ql Cm \&:[2..-1] selects all words from the second word to the last word. If .Ar start is greater than .Ar end , then the words are output in reverse order. For example, .Ql Cm \&:[-1..1] selects all the words from last to first. If the list is already ordered, then this effectively reverses the list, but it is more efficient to use .Ql Cm \&:Or instead of .Ql Cm \&:O:[-1..1] . .\" :[*] .It Cm \&* Causes subsequent modifiers to treat the value as a single word (possibly containing embedded white space). Analogous to the effect of \&"$*\&" in Bourne shell. .\" :[0] .It 0 Means the same as .Ql Cm \&:[*] . .\" :[*] .It Cm \&@ Causes subsequent modifiers to treat the value as a sequence of words delimited by white space. Analogous to the effect of \&"$@\&" in Bourne shell. .\" :[#] .It Cm \&# Returns the number of words in the value. .El \" :[range] .El .Sh INCLUDE STATEMENTS, CONDITIONALS AND FOR LOOPS Makefile inclusion, conditional structures and for loops reminiscent of the C programming language are provided in .Nm . All such structures are identified by a line beginning with a single dot .Pq Ql \&. character. Files are included with either .Cm \&.include \&< Ns Ar file Ns Cm \&> or .Cm \&.include \&\*q Ns Ar file Ns Cm \&\*q . Variables between the angle brackets or double quotes are expanded to form the file name. If angle brackets are used, the included makefile is expected to be in the system makefile directory. If double quotes are used, the including makefile's directory and any directories specified using the .Fl I option are searched before the system makefile directory. For compatibility with other versions of .Nm .Ql include file ... is also accepted. .Pp If the include statement is written as .Cm .-include or as .Cm .sinclude then errors locating and/or opening include files are ignored. .Pp If the include statement is written as .Cm .dinclude not only are errors locating and/or opening include files ignored, but stale dependencies within the included file will be ignored just like .Va .MAKE.DEPENDFILE . .Pp Conditional expressions are also preceded by a single dot as the first character of a line. The possible conditionals are as follows: .Bl -tag -width Ds .It Ic .error Ar message The message is printed along with the name of the makefile and line number, then .Nm will exit immediately. .It Ic .export Ar variable ... Export the specified global variable. If no variable list is provided, all globals are exported except for internal variables (those that start with .Ql \&. ) . This is not affected by the .Fl X flag, so should be used with caution. For compatibility with other .Nm programs .Ql export variable=value is also accepted. .Pp Appending a variable name to .Va .MAKE.EXPORTED is equivalent to exporting a variable. .It Ic .export-env Ar variable ... The same as .Ql .export , except that the variable is not appended to .Va .MAKE.EXPORTED . This allows exporting a value to the environment which is different from that used by .Nm internally. .It Ic .export-literal Ar variable ... The same as .Ql .export-env , except that variables in the value are not expanded. .It Ic .info Ar message The message is printed along with the name of the makefile and line number. -.It Ic .undef Ar variable -Un-define the specified global variable. -Only global variables may be un-defined. +.It Ic .undef Ar variable ... +Un-define the specified global variables. +Only global variables can be un-defined. .It Ic .unexport Ar variable ... The opposite of .Ql .export . The specified global .Va variable will be removed from .Va .MAKE.EXPORTED . If no variable list is provided, all globals are unexported, and .Va .MAKE.EXPORTED deleted. .It Ic .unexport-env Unexport all globals previously exported and clear the environment inherited from the parent. This operation will cause a memory leak of the original environment, so should be used sparingly. Testing for .Va .MAKE.LEVEL being 0, would make sense. Also note that any variables which originated in the parent environment should be explicitly preserved if desired. For example: .Bd -literal -offset indent .Li .if ${.MAKE.LEVEL} == 0 PATH := ${PATH} .Li .unexport-env .Li .export PATH .Li .endif .Pp .Ed Would result in an environment containing only .Ql Ev PATH , which is the minimal useful environment. Actually .Ql Ev .MAKE.LEVEL will also be pushed into the new environment. .It Ic .warning Ar message The message prefixed by .Ql Pa warning: is printed along with the name of the makefile and line number. .It Ic \&.if Oo \&! Oc Ns Ar expression Op Ar operator expression ... Test the value of an expression. .It Ic .ifdef Oo \&! Oc Ns Ar variable Op Ar operator variable ... Test the value of a variable. .It Ic .ifndef Oo \&! Oc Ns Ar variable Op Ar operator variable ... Test the value of a variable. .It Ic .ifmake Oo \&! Oc Ns Ar target Op Ar operator target ... Test the target being built. .It Ic .ifnmake Oo \&! Ns Oc Ar target Op Ar operator target ... Test the target being built. .It Ic .else Reverse the sense of the last conditional. .It Ic .elif Oo \&! Ns Oc Ar expression Op Ar operator expression ... A combination of .Ql Ic .else followed by .Ql Ic .if . .It Ic .elifdef Oo \&! Oc Ns Ar variable Op Ar operator variable ... A combination of .Ql Ic .else followed by .Ql Ic .ifdef . .It Ic .elifndef Oo \&! Oc Ns Ar variable Op Ar operator variable ... A combination of .Ql Ic .else followed by .Ql Ic .ifndef . .It Ic .elifmake Oo \&! Oc Ns Ar target Op Ar operator target ... A combination of .Ql Ic .else followed by .Ql Ic .ifmake . .It Ic .elifnmake Oo \&! Oc Ns Ar target Op Ar operator target ... A combination of .Ql Ic .else followed by .Ql Ic .ifnmake . .It Ic .endif End the body of the conditional. .El .Pp The .Ar operator may be any one of the following: .Bl -tag -width "Cm XX" .It Cm \&|\&| Logical OR. .It Cm \&&& Logical .Tn AND ; of higher precedence than .Dq \&|\&| . .El .Pp As in C, .Nm will only evaluate a conditional as far as is necessary to determine its value. Parentheses may be used to change the order of evaluation. The boolean operator .Ql Ic \&! may be used to logically negate an entire conditional. It is of higher precedence than .Ql Ic \&&& . .Pp The value of .Ar expression may be any of the following: .Bl -tag -width defined .It Ic defined Takes a variable name as an argument and evaluates to true if the variable has been defined. .It Ic make Takes a target name as an argument and evaluates to true if the target was specified as part of .Nm Ns 's command line or was declared the default target (either implicitly or explicitly, see .Va .MAIN ) before the line containing the conditional. .It Ic empty Takes a variable, with possible modifiers, and evaluates to true if the expansion of the variable would result in an empty string. .It Ic exists Takes a file name as an argument and evaluates to true if the file exists. The file is searched for on the system search path (see .Va .PATH ) . .It Ic target Takes a target name as an argument and evaluates to true if the target has been defined. .It Ic commands Takes a target name as an argument and evaluates to true if the target has been defined and has commands associated with it. .El .Pp .Ar Expression may also be an arithmetic or string comparison. Variable expansion is performed on both sides of the comparison, after which the numerical values are compared. A value is interpreted as hexadecimal if it is preceded by 0x, otherwise it is decimal; octal numbers are not supported. The standard C relational operators are all supported. If after variable expansion, either the left or right hand side of a .Ql Ic == or .Ql Ic "!=" operator is not a numerical value, then string comparison is performed between the expanded variables. If no relational operator is given, it is assumed that the expanded variable is being compared against 0, or an empty string in the case of a string comparison. .Pp When .Nm is evaluating one of these conditional expressions, and it encounters a (white-space separated) word it doesn't recognize, either the .Dq make or .Dq defined expression is applied to it, depending on the form of the conditional. If the form is .Ql Ic .ifdef , .Ql Ic .ifndef , or .Ql Ic .if the .Dq defined expression is applied. Similarly, if the form is .Ql Ic .ifmake or .Ql Ic .ifnmake , the .Dq make expression is applied. .Pp If the conditional evaluates to true the parsing of the makefile continues as before. If it evaluates to false, the following lines are skipped. In both cases this continues until a .Ql Ic .else or .Ql Ic .endif is found. .Pp For loops are typically used to apply a set of rules to a list of files. The syntax of a for loop is: .Pp .Bl -tag -compact -width Ds .It Ic \&.for Ar variable Oo Ar variable ... Oc Ic in Ar expression .It Aq make-lines .It Ic \&.endfor .El .Pp After the for .Ic expression is evaluated, it is split into words. On each iteration of the loop, one word is taken and assigned to each .Ic variable , in order, and these .Ic variables are substituted into the .Ic make-lines inside the body of the for loop. The number of words must come out even; that is, if there are three iteration variables, the number of words provided must be a multiple of three. .Sh COMMENTS Comments begin with a hash .Pq Ql \&# character, anywhere but in a shell command line, and continue to the end of an unescaped new line. .Sh SPECIAL SOURCES (ATTRIBUTES) .Bl -tag -width .IGNOREx .It Ic .EXEC Target is never out of date, but always execute commands anyway. .It Ic .IGNORE Ignore any errors from the commands associated with this target, exactly as if they all were preceded by a dash .Pq Ql \- . .\" .It Ic .INVISIBLE .\" XXX .\" .It Ic .JOIN .\" XXX .It Ic .MADE Mark all sources of this target as being up-to-date. .It Ic .MAKE Execute the commands associated with this target even if the .Fl n or .Fl t options were specified. Normally used to mark recursive .Nm Ns s . .It Ic .META Create a meta file for the target, even if it is flagged as .Ic .PHONY , .Ic .MAKE , or .Ic .SPECIAL . Usage in conjunction with .Ic .MAKE is the most likely case. In "meta" mode, the target is out-of-date if the meta file is missing. .It Ic .NOMETA Do not create a meta file for the target. Meta files are also not created for .Ic .PHONY , .Ic .MAKE , or .Ic .SPECIAL targets. .It Ic .NOMETA_CMP Ignore differences in commands when deciding if target is out of date. This is useful if the command contains a value which always changes. If the number of commands change, though, the target will still be out of date. The same effect applies to any command line that uses the variable .Va .OODATE , which can be used for that purpose even when not otherwise needed or desired: .Bd -literal -offset indent skip-compare-for-some: @echo this will be compared @echo this will not ${.OODATE:M.NOMETA_CMP} @echo this will also be compared .Ed The .Cm \&:M pattern suppresses any expansion of the unwanted variable. .It Ic .NOPATH Do not search for the target in the directories specified by .Ic .PATH . .It Ic .NOTMAIN Normally .Nm selects the first target it encounters as the default target to be built if no target was specified. This source prevents this target from being selected. .It Ic .OPTIONAL If a target is marked with this attribute and .Nm can't figure out how to create it, it will ignore this fact and assume the file isn't needed or already exists. .It Ic .PHONY The target does not correspond to an actual file; it is always considered to be out of date, and will not be created with the .Fl t option. Suffix-transformation rules are not applied to .Ic .PHONY targets. .It Ic .PRECIOUS When .Nm is interrupted, it normally removes any partially made targets. This source prevents the target from being removed. .It Ic .RECURSIVE Synonym for .Ic .MAKE . .It Ic .SILENT Do not echo any of the commands associated with this target, exactly as if they all were preceded by an at sign .Pq Ql @ . .It Ic .USE Turn the target into .Nm Ns 's version of a macro. When the target is used as a source for another target, the other target acquires the commands, sources, and attributes (except for .Ic .USE ) of the source. If the target already has commands, the .Ic .USE target's commands are appended to them. .It Ic .USEBEFORE Exactly like .Ic .USE , but prepend the .Ic .USEBEFORE target commands to the target. .It Ic .WAIT If .Ic .WAIT appears in a dependency line, the sources that precede it are made before the sources that succeed it in the line. Since the dependents of files are not made until the file itself could be made, this also stops the dependents being built unless they are needed for another branch of the dependency tree. So given: .Bd -literal x: a .WAIT b echo x a: echo a b: b1 echo b b1: echo b1 .Ed the output is always .Ql a , .Ql b1 , .Ql b , .Ql x . .br The ordering imposed by .Ic .WAIT is only relevant for parallel makes. .El .Sh SPECIAL TARGETS Special targets may not be included with other targets, i.e. they must be the only target specified. .Bl -tag -width .BEGINx .It Ic .BEGIN Any command lines attached to this target are executed before anything else is done. .It Ic .DEFAULT This is sort of a .Ic .USE rule for any target (that was used only as a source) that .Nm can't figure out any other way to create. Only the shell script is used. The .Ic .IMPSRC variable of a target that inherits .Ic .DEFAULT Ns 's commands is set to the target's own name. .It Ic .DELETE_ON_ERROR If this target is present in the makefile, it globally causes make to delete targets whose commands fail. (By default, only targets whose commands are interrupted during execution are deleted. This is the historical behavior.) This setting can be used to help prevent half-finished or malformed targets from being left around and corrupting future rebuilds. .It Ic .END Any command lines attached to this target are executed after everything else is done. .It Ic .ERROR Any command lines attached to this target are executed when another target fails. The .Ic .ERROR_TARGET variable is set to the target that failed. See also .Ic MAKE_PRINT_VAR_ON_ERROR . .It Ic .IGNORE Mark each of the sources with the .Ic .IGNORE attribute. If no sources are specified, this is the equivalent of specifying the .Fl i option. .It Ic .INTERRUPT If .Nm is interrupted, the commands for this target will be executed. .It Ic .MAIN If no target is specified when .Nm is invoked, this target will be built. .It Ic .MAKEFLAGS This target provides a way to specify flags for .Nm when the makefile is used. The flags are as if typed to the shell, though the .Fl f option will have no effect. .\" XXX: NOT YET!!!! .\" .It Ic .NOTPARALLEL .\" The named targets are executed in non parallel mode. .\" If no targets are .\" specified, then all targets are executed in non parallel mode. .It Ic .NOPATH Apply the .Ic .NOPATH attribute to any specified sources. .It Ic .NOTPARALLEL Disable parallel mode. .It Ic .NO_PARALLEL Synonym for .Ic .NOTPARALLEL , for compatibility with other pmake variants. .It Ic .OBJDIR The source is a new value for .Ql Va .OBJDIR . If it exists, .Nm will .Xr chdir 2 to it and update the value of .Ql Va .OBJDIR . .It Ic .ORDER The named targets are made in sequence. This ordering does not add targets to the list of targets to be made. Since the dependents of a target do not get built until the target itself could be built, unless .Ql a is built by another part of the dependency graph, the following is a dependency loop: .Bd -literal \&.ORDER: b a b: a .Ed .Pp The ordering imposed by .Ic .ORDER is only relevant for parallel makes. .\" XXX: NOT YET!!!! .\" .It Ic .PARALLEL .\" The named targets are executed in parallel mode. .\" If no targets are .\" specified, then all targets are executed in parallel mode. .It Ic .PATH The sources are directories which are to be searched for files not found in the current directory. If no sources are specified, any previously specified directories are deleted. If the source is the special .Ic .DOTLAST target, then the current working directory is searched last. .It Ic .PATH. Ns Va suffix Like .Ic .PATH but applies only to files with a particular suffix. The suffix must have been previously declared with .Ic .SUFFIXES . .It Ic .PHONY Apply the .Ic .PHONY attribute to any specified sources. .It Ic .PRECIOUS Apply the .Ic .PRECIOUS attribute to any specified sources. If no sources are specified, the .Ic .PRECIOUS attribute is applied to every target in the file. .It Ic .SHELL Sets the shell that .Nm will use to execute commands. The sources are a set of .Ar field=value pairs. .Bl -tag -width hasErrCtls .It Ar name This is the minimal specification, used to select one of the built-in shell specs; .Ar sh , .Ar ksh , and .Ar csh . .It Ar path Specifies the path to the shell. .It Ar hasErrCtl Indicates whether the shell supports exit on error. .It Ar check The command to turn on error checking. .It Ar ignore The command to disable error checking. .It Ar echo The command to turn on echoing of commands executed. .It Ar quiet The command to turn off echoing of commands executed. .It Ar filter The output to filter after issuing the .Ar quiet command. It is typically identical to .Ar quiet . .It Ar errFlag The flag to pass the shell to enable error checking. .It Ar echoFlag The flag to pass the shell to enable command echoing. .It Ar newline The string literal to pass the shell that results in a single newline character when used outside of any quoting characters. .El Example: .Bd -literal \&.SHELL: name=ksh path=/bin/ksh hasErrCtl=true \e check="set \-e" ignore="set +e" \e echo="set \-v" quiet="set +v" filter="set +v" \e echoFlag=v errFlag=e newline="'\en'" .Ed .It Ic .SILENT Apply the .Ic .SILENT attribute to any specified sources. If no sources are specified, the .Ic .SILENT attribute is applied to every command in the file. .It Ic .STALE This target gets run when a dependency file contains stale entries, having .Va .ALLSRC set to the name of that dependency file. .It Ic .SUFFIXES Each source specifies a suffix to .Nm . If no sources are specified, any previously specified suffixes are deleted. It allows the creation of suffix-transformation rules. .Pp Example: .Bd -literal \&.SUFFIXES: .o \&.c.o: cc \-o ${.TARGET} \-c ${.IMPSRC} .Ed .El .Sh ENVIRONMENT .Nm uses the following environment variables, if they exist: .Ev MACHINE , .Ev MACHINE_ARCH , .Ev MAKE , .Ev MAKEFLAGS , .Ev MAKEOBJDIR , .Ev MAKEOBJDIRPREFIX , .Ev MAKESYSPATH , .Ev PWD , and .Ev TMPDIR . .Pp .Ev MAKEOBJDIRPREFIX and .Ev MAKEOBJDIR may only be set in the environment or on the command line to .Nm and not as makefile variables; see the description of .Ql Va .OBJDIR for more details. .Sh FILES .Bl -tag -width /usr/share/mk -compact .It .depend list of dependencies .It Makefile list of dependencies .It makefile list of dependencies .It sys.mk system makefile .It /usr/share/mk system makefile directory .El .Sh COMPATIBILITY The basic make syntax is compatible between different versions of make; however the special variables, variable modifiers and conditionals are not. .Ss Older versions An incomplete list of changes in older versions of .Nm : .Pp The way that .for loop variables are substituted changed after .Nx 5.0 so that they still appear to be variable expansions. In particular this stops them being treated as syntax, and removes some obscure problems using them in .if statements. .Pp The way that parallel makes are scheduled changed in .Nx 4.0 so that .ORDER and .WAIT apply recursively to the dependent nodes. The algorithms used may change again in the future. .Ss Other make dialects Other make dialects (GNU make, SVR4 make, POSIX make, etc.) do not support most of the features of .Nm as described in this manual. Most notably: .Bl -bullet -offset indent .It The .Ic .WAIT and .Ic .ORDER declarations and most functionality pertaining to parallelization. (GNU make supports parallelization but lacks these features needed to control it effectively.) .It Directives, including for loops and conditionals and most of the forms of include files. (GNU make has its own incompatible and less powerful syntax for conditionals.) .It All built-in variables that begin with a dot. .It Most of the special sources and targets that begin with a dot, with the notable exception of .Ic .PHONY , .Ic .PRECIOUS , and .Ic .SUFFIXES . .It Variable modifiers, except for the .Dl :old=new string substitution, which does not portably support globbing with .Ql % and historically only works on declared suffixes. .It The .Ic $> variable even in its short form; most makes support this functionality but its name varies. .El .Pp Some features are somewhat more portable, such as assignment with .Ic += , .Ic ?= , and .Ic != . The .Ic .PATH functionality is based on an older feature .Ic VPATH found in GNU make and many versions of SVR4 make; however, historically its behavior is too ill-defined (and too buggy) to rely upon. .Pp The .Ic $@ and .Ic $< variables are more or less universally portable, as is the .Ic $(MAKE) variable. Basic use of suffix rules (for files only in the current directory, not trying to chain transformations together, etc.) is also reasonably portable. .Sh SEE ALSO .Xr mkdep 1 .Sh HISTORY A .Nm command appeared in .At v7 . This .Nm implementation is based on Adam De Boor's pmake program which was written for Sprite at Berkeley. It was designed to be a parallel distributed make running jobs on different machines using a daemon called .Dq customs . .Pp Historically the target/dependency .Dq FRC has been used to FoRCe rebuilding (since the target/dependency does not exist... unless someone creates an .Dq FRC file). .Sh BUGS The .Nm syntax is difficult to parse without actually acting on the data. For instance, finding the end of a variable's use should involve scanning each of the modifiers, using the correct terminator for each field. In many places .Nm just counts {} and () in order to find the end of a variable expansion. .Pp There is no way of escaping a space character in a filename. diff --git a/make.c b/make.c index d0502e80c8ef..7745e038c814 100644 --- a/make.c +++ b/make.c @@ -1,1350 +1,1445 @@ -/* $NetBSD: make.c,v 1.209 2020/11/16 22:31:42 rillig Exp $ */ +/* $NetBSD: make.c,v 1.234 2021/01/10 21:20:46 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* Examination of targets and their suitability for creation. +/* + * Examination of targets and their suitability for creation. * * Interface: * Make_Run Initialize things for the module. Returns TRUE if * work was (or would have been) done. * * Make_Update After a target is made, update all its parents. * Perform various bookkeeping chores like the updating * of the youngestChild field of the parent, filling * of the IMPSRC context variable, etc. Place the parent * on the toBeMade queue if it should be. * * GNode_UpdateYoungestChild * Update the node's youngestChild field based on the * child's modification time. * * Make_DoAllVar Set up the various local variables for a * target, including the .ALLSRC variable, making * sure that any variable that needs to exist * at the very least has the empty value. * * GNode_IsOODate Determine if a target is out-of-date. * * Make_HandleUse See if a child is a .USE node for a parent * and perform the .USE actions if so. * * Make_ExpandUse Expand .USE nodes */ #include "make.h" #include "dir.h" #include "job.h" /* "@(#)make.c 8.1 (Berkeley) 6/6/93" */ -MAKE_RCSID("$NetBSD: make.c,v 1.209 2020/11/16 22:31:42 rillig Exp $"); +MAKE_RCSID("$NetBSD: make.c,v 1.234 2021/01/10 21:20:46 rillig Exp $"); /* Sequence # to detect recursion. */ static unsigned int checked_seqno = 1; -/* The current fringe of the graph. +/* + * The current fringe of the graph. * These are nodes which await examination by MakeOODate. - * It is added to by Make_Update and subtracted from by MakeStartJobs */ -static GNodeList *toBeMade; + * It is added to by Make_Update and subtracted from by MakeStartJobs + */ +static GNodeList toBeMade = LST_INIT; -static int MakeBuildParent(void *, void *); void debug_printf(const char *fmt, ...) { - va_list args; + va_list args; - va_start(args, fmt); - vfprintf(opts.debug_file, fmt, args); - va_end(args); + va_start(args, fmt); + vfprintf(opts.debug_file, fmt, args); + va_end(args); } MAKE_ATTR_DEAD static void -make_abort(GNode *gn, int line) +make_abort(GNode *gn, int lineno) { - debug_printf("make_abort from line %d\n", line); - Targ_PrintNode(gn, 2); - Targ_PrintNodes(toBeMade, 2); - Targ_PrintGraph(3); - abort(); + + debug_printf("make_abort from line %d\n", lineno); + Targ_PrintNode(gn, 2); + Targ_PrintNodes(&toBeMade, 2); + Targ_PrintGraph(3); + abort(); } ENUM_VALUE_RTTI_8(GNodeMade, - UNMADE, DEFERRED, REQUESTED, BEINGMADE, - MADE, UPTODATE, ERROR, ABORTED); + UNMADE, DEFERRED, REQUESTED, BEINGMADE, + MADE, UPTODATE, ERROR, ABORTED); ENUM_FLAGS_RTTI_31(GNodeType, - OP_DEPENDS, OP_FORCE, OP_DOUBLEDEP, - /* OP_OPMASK is omitted since it combines other flags */ - OP_OPTIONAL, OP_USE, OP_EXEC, OP_IGNORE, - OP_PRECIOUS, OP_SILENT, OP_MAKE, OP_JOIN, - OP_MADE, OP_SPECIAL, OP_USEBEFORE, OP_INVISIBLE, - OP_NOTMAIN, OP_PHONY, OP_NOPATH, OP_WAIT, - OP_NOMETA, OP_META, OP_NOMETA_CMP, OP_SUBMAKE, - OP_TRANSFORM, OP_MEMBER, OP_LIB, OP_ARCHV, - OP_HAS_COMMANDS, OP_SAVE_CMDS, OP_DEPS_FOUND, OP_MARK); + OP_DEPENDS, OP_FORCE, OP_DOUBLEDEP, +/* OP_OPMASK is omitted since it combines other flags */ + OP_OPTIONAL, OP_USE, OP_EXEC, OP_IGNORE, + OP_PRECIOUS, OP_SILENT, OP_MAKE, OP_JOIN, + OP_MADE, OP_SPECIAL, OP_USEBEFORE, OP_INVISIBLE, + OP_NOTMAIN, OP_PHONY, OP_NOPATH, OP_WAIT, + OP_NOMETA, OP_META, OP_NOMETA_CMP, OP_SUBMAKE, + OP_TRANSFORM, OP_MEMBER, OP_LIB, OP_ARCHV, + OP_HAS_COMMANDS, OP_SAVE_CMDS, OP_DEPS_FOUND, OP_MARK); ENUM_FLAGS_RTTI_10(GNodeFlags, - REMAKE, CHILDMADE, FORCE, DONE_WAIT, - DONE_ORDER, FROM_DEPEND, DONE_ALLSRC, CYCLE, - DONECYCLE, INTERNAL); + REMAKE, CHILDMADE, FORCE, DONE_WAIT, + DONE_ORDER, FROM_DEPEND, DONE_ALLSRC, CYCLE, + DONECYCLE, INTERNAL); void GNode_FprintDetails(FILE *f, const char *prefix, const GNode *gn, const char *suffix) { - char type_buf[GNodeType_ToStringSize]; - char flags_buf[GNodeFlags_ToStringSize]; + char type_buf[GNodeType_ToStringSize]; + char flags_buf[GNodeFlags_ToStringSize]; - fprintf(f, "%smade %s, type %s, flags %s%s", + fprintf(f, "%smade %s, type %s, flags %s%s", prefix, Enum_ValueToString(gn->made, GNodeMade_ToStringSpecs), Enum_FlagsToString(type_buf, sizeof type_buf, - gn->type, GNodeType_ToStringSpecs), + gn->type, GNodeType_ToStringSpecs), Enum_FlagsToString(flags_buf, sizeof flags_buf, - gn->flags, GNodeFlags_ToStringSpecs), + gn->flags, GNodeFlags_ToStringSpecs), suffix); } Boolean GNode_ShouldExecute(GNode *gn) { - return !((gn->type & OP_MAKE) ? opts.noRecursiveExecute : opts.noExecute); + return !((gn->type & OP_MAKE) + ? opts.noRecursiveExecute + : opts.noExecute); } /* Update the youngest child of the node, according to the given child. */ void GNode_UpdateYoungestChild(GNode *gn, GNode *cgn) { - if (gn->youngestChild == NULL || cgn->mtime > gn->youngestChild->mtime) - gn->youngestChild = cgn; + if (gn->youngestChild == NULL || cgn->mtime > gn->youngestChild->mtime) + gn->youngestChild = cgn; } static Boolean IsOODateRegular(GNode *gn) { - /* These rules are inherited from the original Make. */ - - if (gn->youngestChild != NULL) { - if (gn->mtime < gn->youngestChild->mtime) { - DEBUG1(MAKE, "modified before source \"%s\"...", - GNode_Path(gn->youngestChild)); - return TRUE; + /* These rules are inherited from the original Make. */ + + if (gn->youngestChild != NULL) { + if (gn->mtime < gn->youngestChild->mtime) { + DEBUG1(MAKE, "modified before source \"%s\"...", + GNode_Path(gn->youngestChild)); + return TRUE; + } + return FALSE; } - return FALSE; - } - if (gn->mtime == 0 && !(gn->type & OP_OPTIONAL)) { - DEBUG0(MAKE, "non-existent and no sources..."); - return TRUE; - } + if (gn->mtime == 0 && !(gn->type & OP_OPTIONAL)) { + DEBUG0(MAKE, "nonexistent and no sources..."); + return TRUE; + } - if (gn->type & OP_DOUBLEDEP) { - DEBUG0(MAKE, ":: operator and no sources..."); - return TRUE; - } + if (gn->type & OP_DOUBLEDEP) { + DEBUG0(MAKE, ":: operator and no sources..."); + return TRUE; + } - return FALSE; + return FALSE; } -/* See if the node is out of date with respect to its sources. +/* + * See if the node is out of date with respect to its sources. * * Used by Make_Run when deciding which nodes to place on the * toBeMade queue initially and by Make_Update to screen out .USE and * .EXEC nodes. In the latter case, however, any other sort of node * must be considered out-of-date since at least one of its children * will have been recreated. * * The mtime field of the node and the youngestChild field of its parents * may be changed. */ Boolean GNode_IsOODate(GNode *gn) { - Boolean oodate; - - /* - * Certain types of targets needn't even be sought as their datedness - * doesn't depend on their modification time... - */ - if (!(gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC))) { - Dir_UpdateMTime(gn, TRUE); - if (DEBUG(MAKE)) { - if (gn->mtime != 0) - debug_printf("modified %s...", Targ_FmtTime(gn->mtime)); - else - debug_printf("non-existent..."); - } - } - - /* - * A target is remade in one of the following circumstances: - * its modification time is smaller than that of its youngest child and - * it would actually be run (has commands or is not GNode_IsTarget) - * it's the object of a force operator - * it has no children, was on the lhs of an operator and doesn't exist - * already. - * - * Libraries are only considered out-of-date if the archive module says - * they are. - * - * These weird rules are brought to you by Backward-Compatibility and - * the strange people who wrote 'Make'. - */ - if (gn->type & (OP_USE|OP_USEBEFORE)) { - /* - * If the node is a USE node it is *never* out of date - * no matter *what*. - */ - DEBUG0(MAKE, ".USE node..."); - oodate = FALSE; - } else if ((gn->type & OP_LIB) && (gn->mtime == 0 || Arch_IsLib(gn))) { - DEBUG0(MAKE, "library..."); + Boolean oodate; /* - * always out of date if no children and :: target - * or non-existent. + * Certain types of targets needn't even be sought as their datedness + * doesn't depend on their modification time... */ - oodate = (gn->mtime == 0 || Arch_LibOODate(gn) || - (gn->youngestChild == NULL && (gn->type & OP_DOUBLEDEP))); - } else if (gn->type & OP_JOIN) { - /* - * A target with the .JOIN attribute is only considered - * out-of-date if any of its children was out-of-date. - */ - DEBUG0(MAKE, ".JOIN node..."); - DEBUG1(MAKE, "source %smade...", gn->flags & CHILDMADE ? "" : "not "); - oodate = (gn->flags & CHILDMADE) != 0; - } else if (gn->type & (OP_FORCE|OP_EXEC|OP_PHONY)) { - /* - * A node which is the object of the force (!) operator or which has - * the .EXEC attribute is always considered out-of-date. - */ - if (DEBUG(MAKE)) { - if (gn->type & OP_FORCE) { - debug_printf("! operator..."); - } else if (gn->type & OP_PHONY) { - debug_printf(".PHONY node..."); - } else { - debug_printf(".EXEC node..."); - } + if (!(gn->type & (OP_JOIN | OP_USE | OP_USEBEFORE | OP_EXEC))) { + Dir_UpdateMTime(gn, TRUE); + if (DEBUG(MAKE)) { + if (gn->mtime != 0) + debug_printf("modified %s...", + Targ_FmtTime(gn->mtime)); + else + debug_printf("nonexistent..."); + } } - oodate = TRUE; - } else if (IsOODateRegular(gn)) { - oodate = TRUE; - } else { + /* - * When a non-existing child with no sources - * (such as a typically used FORCE source) has been made and - * the target of the child (usually a directory) has the same - * timestamp as the timestamp just given to the non-existing child - * after it was considered made. + * A target is remade in one of the following circumstances: + * + * its modification time is smaller than that of its youngest + * child and it would actually be run (has commands or is not + * GNode_IsTarget) + * + * it's the object of a force operator + * + * it has no children, was on the lhs of an operator and doesn't + * exist already. + * + * Libraries are only considered out-of-date if the archive module + * says they are. + * + * These weird rules are brought to you by Backward-Compatibility + * and the strange people who wrote 'Make'. */ - if (DEBUG(MAKE)) { - if (gn->flags & FORCE) - debug_printf("non existing child..."); + if (gn->type & (OP_USE | OP_USEBEFORE)) { + /* + * If the node is a USE node it is *never* out of date + * no matter *what*. + */ + DEBUG0(MAKE, ".USE node..."); + oodate = FALSE; + } else if ((gn->type & OP_LIB) && (gn->mtime == 0 || Arch_IsLib(gn))) { + DEBUG0(MAKE, "library..."); + + /* + * always out of date if no children and :: target + * or nonexistent. + */ + oodate = (gn->mtime == 0 || Arch_LibOODate(gn) || + (gn->youngestChild == NULL && + (gn->type & OP_DOUBLEDEP))); + } else if (gn->type & OP_JOIN) { + /* + * A target with the .JOIN attribute is only considered + * out-of-date if any of its children was out-of-date. + */ + DEBUG0(MAKE, ".JOIN node..."); + DEBUG1(MAKE, "source %smade...", + gn->flags & CHILDMADE ? "" : "not "); + oodate = (gn->flags & CHILDMADE) != 0; + } else if (gn->type & (OP_FORCE | OP_EXEC | OP_PHONY)) { + /* + * A node which is the object of the force (!) operator or + * which has the .EXEC attribute is always considered + * out-of-date. + */ + if (DEBUG(MAKE)) { + if (gn->type & OP_FORCE) { + debug_printf("! operator..."); + } else if (gn->type & OP_PHONY) { + debug_printf(".PHONY node..."); + } else { + debug_printf(".EXEC node..."); + } + } + oodate = TRUE; + } else if (IsOODateRegular(gn)) { + oodate = TRUE; + } else { + /* + * When a nonexistent child with no sources + * (such as a typically used FORCE source) has been made and + * the target of the child (usually a directory) has the same + * timestamp as the timestamp just given to the nonexistent + * child after it was considered made. + */ + if (DEBUG(MAKE)) { + if (gn->flags & FORCE) + debug_printf("non existing child..."); + } + oodate = (gn->flags & FORCE) != 0; } - oodate = (gn->flags & FORCE) != 0; - } #ifdef USE_META - if (useMeta) { - oodate = meta_oodate(gn, oodate); - } + if (useMeta) { + oodate = meta_oodate(gn, oodate); + } #endif - /* - * If the target isn't out-of-date, the parents need to know its - * modification time. Note that targets that appear to be out-of-date - * but aren't, because they have no commands and are GNode_IsTarget, - * have their mtime stay below their children's mtime to keep parents from - * thinking they're out-of-date. - */ - if (!oodate) { - GNodeListNode *ln; - for (ln = gn->parents->first; ln != NULL; ln = ln->next) - GNode_UpdateYoungestChild(ln->datum, gn); - } + /* + * If the target isn't out-of-date, the parents need to know its + * modification time. Note that targets that appear to be out-of-date + * but aren't, because they have no commands and are GNode_IsTarget, + * have their mtime stay below their children's mtime to keep parents + * from thinking they're out-of-date. + */ + if (!oodate) { + GNodeListNode *ln; + for (ln = gn->parents.first; ln != NULL; ln = ln->next) + GNode_UpdateYoungestChild(ln->datum, gn); + } - return oodate; + return oodate; } static void PretendAllChildrenAreMade(GNode *pgn) { - GNodeListNode *ln; + GNodeListNode *ln; - for (ln = pgn->children->first; ln != NULL; ln = ln->next) { - GNode *cgn = ln->datum; + for (ln = pgn->children.first; ln != NULL; ln = ln->next) { + GNode *cgn = ln->datum; - Dir_UpdateMTime(cgn, FALSE); /* cgn->path may get updated as well */ - GNode_UpdateYoungestChild(pgn, cgn); - pgn->unmade--; - } + /* This may also update cgn->path. */ + Dir_UpdateMTime(cgn, FALSE); + GNode_UpdateYoungestChild(pgn, cgn); + pgn->unmade--; + } } -/* Called by Make_Run and SuffApplyTransform on the downward pass to handle +/* + * Called by Make_Run and SuffApplyTransform on the downward pass to handle * .USE and transformation nodes, by copying the child node's commands, type * flags and children to the parent node. * * A .USE node is much like an explicit transformation rule, except its * commands are always added to the target node, even if the target already * has commands. * * Input: * cgn The source node, which is either a .USE/.USEBEFORE * node or a transformation node (OP_TRANSFORM). * pgn The target node */ void Make_HandleUse(GNode *cgn, GNode *pgn) { - GNodeListNode *ln; /* An element in the children list */ + GNodeListNode *ln; /* An element in the children list */ #ifdef DEBUG_SRC - if (!(cgn->type & (OP_USE|OP_USEBEFORE|OP_TRANSFORM))) { - debug_printf("Make_HandleUse: called for plain node %s\n", cgn->name); - return; /* XXX: debug mode should not affect control flow */ - } + if (!(cgn->type & (OP_USE | OP_USEBEFORE | OP_TRANSFORM))) { + debug_printf("Make_HandleUse: called for plain node %s\n", + cgn->name); + /* XXX: debug mode should not affect control flow */ + return; + } #endif - if ((cgn->type & (OP_USE|OP_USEBEFORE)) || Lst_IsEmpty(pgn->commands)) { - if (cgn->type & OP_USEBEFORE) { - /* .USEBEFORE */ - Lst_PrependAll(pgn->commands, cgn->commands); - } else { - /* .USE, or target has no commands */ - Lst_AppendAll(pgn->commands, cgn->commands); - } - } + if ((cgn->type & (OP_USE | OP_USEBEFORE)) || + Lst_IsEmpty(&pgn->commands)) { + if (cgn->type & OP_USEBEFORE) { + /* .USEBEFORE */ + Lst_PrependAll(&pgn->commands, &cgn->commands); + } else { + /* .USE, or target has no commands */ + Lst_AppendAll(&pgn->commands, &cgn->commands); + } + } - for (ln = cgn->children->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; + for (ln = cgn->children.first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; - /* - * Expand variables in the .USE node's name - * and save the unexpanded form. - * We don't need to do this for commands. - * They get expanded properly when we execute. - */ - if (gn->uname == NULL) { - gn->uname = gn->name; - } else { - free(gn->name); - } - (void)Var_Subst(gn->uname, pgn, VARE_WANTRES, &gn->name); - /* TODO: handle errors */ - if (gn->uname && strcmp(gn->name, gn->uname) != 0) { - /* See if we have a target for this node. */ - GNode *tgn = Targ_FindNode(gn->name); - if (tgn != NULL) - gn = tgn; + /* + * Expand variables in the .USE node's name + * and save the unexpanded form. + * We don't need to do this for commands. + * They get expanded properly when we execute. + */ + if (gn->uname == NULL) { + gn->uname = gn->name; + } else { + free(gn->name); + } + (void)Var_Subst(gn->uname, pgn, VARE_WANTRES, &gn->name); + /* TODO: handle errors */ + if (gn->uname != NULL && strcmp(gn->name, gn->uname) != 0) { + /* See if we have a target for this node. */ + GNode *tgn = Targ_FindNode(gn->name); + if (tgn != NULL) + gn = tgn; + } + + Lst_Append(&pgn->children, gn); + Lst_Append(&gn->parents, pgn); + pgn->unmade++; } - Lst_Append(pgn->children, gn); - Lst_Append(gn->parents, pgn); - pgn->unmade++; - } - - pgn->type |= cgn->type & ~(OP_OPMASK|OP_USE|OP_USEBEFORE|OP_TRANSFORM); + pgn->type |= + cgn->type & ~(OP_OPMASK | OP_USE | OP_USEBEFORE | OP_TRANSFORM); } -/* Used by Make_Run on the downward pass to handle .USE nodes. Should be +/* + * Used by Make_Run on the downward pass to handle .USE nodes. Should be * called before the children are enqueued to be looked at by MakeAddChild. * * For a .USE child, the commands, type flags and children are copied to the * parent node, and since the relation to the .USE node is then no longer * needed, that relation is removed. * * Input: * cgn the child, which may be a .USE node * pgn the current parent */ static void MakeHandleUse(GNode *cgn, GNode *pgn, GNodeListNode *ln) { - Boolean unmarked; - - unmarked = !(cgn->type & OP_MARK); - cgn->type |= OP_MARK; - - if (!(cgn->type & (OP_USE|OP_USEBEFORE))) - return; - - if (unmarked) - Make_HandleUse(cgn, pgn); - - /* - * This child node is now "made", so we decrement the count of - * unmade children in the parent... We also remove the child - * from the parent's list to accurately reflect the number of decent - * children the parent has. This is used by Make_Run to decide - * whether to queue the parent or examine its children... - */ - Lst_Remove(pgn->children, ln); - pgn->unmade--; + Boolean unmarked; + + unmarked = !(cgn->type & OP_MARK); + cgn->type |= OP_MARK; + + if (!(cgn->type & (OP_USE | OP_USEBEFORE))) + return; + + if (unmarked) + Make_HandleUse(cgn, pgn); + + /* + * This child node is now "made", so we decrement the count of + * unmade children in the parent... We also remove the child + * from the parent's list to accurately reflect the number of decent + * children the parent has. This is used by Make_Run to decide + * whether to queue the parent or examine its children... + */ + Lst_Remove(&pgn->children, ln); + pgn->unmade--; } static void HandleUseNodes(GNode *gn) { - GNodeListNode *ln, *nln; - for (ln = gn->children->first; ln != NULL; ln = nln) { - nln = ln->next; - MakeHandleUse(ln->datum, gn, ln); - } + GNodeListNode *ln, *nln; + for (ln = gn->children.first; ln != NULL; ln = nln) { + nln = ln->next; + MakeHandleUse(ln->datum, gn, ln); + } } -/* Check the modification time of a gnode, and update it if necessary. - * Return 0 if the gnode does not exist, or its filesystem time if it does. */ +/* + * Check the modification time of a gnode, and update it if necessary. + * Return 0 if the gnode does not exist, or its filesystem time if it does. + */ time_t Make_Recheck(GNode *gn) { - time_t mtime; + time_t mtime; - Dir_UpdateMTime(gn, TRUE); - mtime = gn->mtime; + Dir_UpdateMTime(gn, TRUE); + mtime = gn->mtime; #ifndef RECHECK - /* - * We can't re-stat the thing, but we can at least take care of rules - * where a target depends on a source that actually creates the - * target, but only if it has changed, e.g. - * - * parse.h : parse.o - * - * parse.o : parse.y - * yacc -d parse.y - * cc -c y.tab.c - * mv y.tab.o parse.o - * cmp -s y.tab.h parse.h || mv y.tab.h parse.h - * - * In this case, if the definitions produced by yacc haven't changed - * from before, parse.h won't have been updated and gn->mtime will - * reflect the current modification time for parse.h. This is - * something of a kludge, I admit, but it's a useful one. - * - * XXX: People like to use a rule like "FRC:" to force things that - * depend on FRC to be made, so we have to check for gn->children - * being empty as well. - */ - if (!Lst_IsEmpty(gn->commands) || Lst_IsEmpty(gn->children)) { - gn->mtime = now; - } + /* + * We can't re-stat the thing, but we can at least take care of rules + * where a target depends on a source that actually creates the + * target, but only if it has changed, e.g. + * + * parse.h : parse.o + * + * parse.o : parse.y + * yacc -d parse.y + * cc -c y.tab.c + * mv y.tab.o parse.o + * cmp -s y.tab.h parse.h || mv y.tab.h parse.h + * + * In this case, if the definitions produced by yacc haven't changed + * from before, parse.h won't have been updated and gn->mtime will + * reflect the current modification time for parse.h. This is + * something of a kludge, I admit, but it's a useful one. + * + * XXX: People like to use a rule like "FRC:" to force things that + * depend on FRC to be made, so we have to check for gn->children + * being empty as well. + */ + if (!Lst_IsEmpty(gn->commands) || Lst_IsEmpty(gn->children)) { + gn->mtime = now; + } #else - /* - * This is what Make does and it's actually a good thing, as it - * allows rules like - * - * cmp -s y.tab.h parse.h || cp y.tab.h parse.h - * - * to function as intended. Unfortunately, thanks to the stateless - * nature of NFS (by which I mean the loose coupling of two clients - * using the same file from a common server), there are times - * when the modification time of a file created on a remote - * machine will not be modified before the local stat() implied by - * the Dir_UpdateMTime occurs, thus leading us to believe that the file - * is unchanged, wreaking havoc with files that depend on this one. - * - * I have decided it is better to make too much than to make too - * little, so this stuff is commented out unless you're sure it's ok. - * -- ardeb 1/12/88 - */ - /* - * Christos, 4/9/92: If we are saving commands, pretend that - * the target is made now. Otherwise archives with '...' rules - * don't work! - */ - if (!GNode_ShouldExecute(gn) || (gn->type & OP_SAVE_CMDS) || + /* + * This is what Make does and it's actually a good thing, as it + * allows rules like + * + * cmp -s y.tab.h parse.h || cp y.tab.h parse.h + * + * to function as intended. Unfortunately, thanks to the stateless + * nature of NFS (by which I mean the loose coupling of two clients + * using the same file from a common server), there are times when + * the modification time of a file created on a remote machine + * will not be modified before the local stat() implied by the + * Dir_UpdateMTime occurs, thus leading us to believe that the file + * is unchanged, wreaking havoc with files that depend on this one. + * + * I have decided it is better to make too much than to make too + * little, so this stuff is commented out unless you're sure it's ok. + * -- ardeb 1/12/88 + */ + /* + * Christos, 4/9/92: If we are saving commands, pretend that + * the target is made now. Otherwise archives with '...' rules + * don't work! + */ + if (!GNode_ShouldExecute(gn) || (gn->type & OP_SAVE_CMDS) || (mtime == 0 && !(gn->type & OP_WAIT))) { - DEBUG2(MAKE, " recheck(%s): update time from %s to now\n", - gn->name, Targ_FmtTime(gn->mtime)); - gn->mtime = now; - } else { - DEBUG2(MAKE, " recheck(%s): current update time: %s\n", - gn->name, Targ_FmtTime(gn->mtime)); - } + DEBUG2(MAKE, " recheck(%s): update time from %s to now\n", + gn->name, + gn->mtime == 0 ? "nonexistent" : Targ_FmtTime(gn->mtime)); + gn->mtime = now; + } else { + DEBUG2(MAKE, " recheck(%s): current update time: %s\n", + gn->name, Targ_FmtTime(gn->mtime)); + } #endif - /* XXX: The returned mtime may differ from gn->mtime. - * Intentionally? */ - return mtime; + /* XXX: The returned mtime may differ from gn->mtime. + * Intentionally? */ + return mtime; } /* * Set the .PREFIX and .IMPSRC variables for all the implied parents * of this node. */ static void UpdateImplicitParentsVars(GNode *cgn, const char *cname) { - GNodeListNode *ln; - const char *cpref = GNode_VarPrefix(cgn); - - for (ln = cgn->implicitParents->first; ln != NULL; ln = ln->next) { - GNode *pgn = ln->datum; - if (pgn->flags & REMAKE) { - Var_Set(IMPSRC, cname, pgn); - if (cpref != NULL) - Var_Set(PREFIX, cpref, pgn); + GNodeListNode *ln; + const char *cpref = GNode_VarPrefix(cgn); + + for (ln = cgn->implicitParents.first; ln != NULL; ln = ln->next) { + GNode *pgn = ln->datum; + if (pgn->flags & REMAKE) { + Var_Set(IMPSRC, cname, pgn); + if (cpref != NULL) + Var_Set(PREFIX, cpref, pgn); + } } - } } /* See if a .ORDER rule stops us from building this node. */ static Boolean IsWaitingForOrder(GNode *gn) { - GNodeListNode *ln; + GNodeListNode *ln; + + for (ln = gn->order_pred.first; ln != NULL; ln = ln->next) { + GNode *ogn = ln->datum; - for (ln = gn->order_pred->first; ln != NULL; ln = ln->next) { - GNode *ogn = ln->datum; + if (GNode_IsDone(ogn) || !(ogn->flags & REMAKE)) + continue; - if (ogn->made >= MADE || !(ogn->flags & REMAKE)) - continue; + DEBUG2(MAKE, + "IsWaitingForOrder: Waiting for .ORDER node \"%s%s\"\n", + ogn->name, ogn->cohort_num); + return TRUE; + } + return FALSE; +} - DEBUG2(MAKE, "IsWaitingForOrder: Waiting for .ORDER node \"%s%s\"\n", - ogn->name, ogn->cohort_num); - return TRUE; - } - return FALSE; +static int MakeBuildParent(GNode *, GNodeListNode *); + +static void +ScheduleOrderSuccessors(GNode *gn) +{ + GNodeListNode *toBeMadeNext = toBeMade.first; + GNodeListNode *ln; + + for (ln = gn->order_succ.first; ln != NULL; ln = ln->next) + if (MakeBuildParent(ln->datum, toBeMadeNext) != 0) + break; } -/* Perform update on the parents of a node. Used by JobFinish once +/* + * Perform update on the parents of a node. Used by JobFinish once * a node has been dealt with and by MakeStartJobs if it finds an * up-to-date node. * * The unmade field of pgn is decremented and pgn may be placed on * the toBeMade queue if this field becomes 0. * * If the child was made, the parent's flag CHILDMADE field will be * set true. * * If the child is not up-to-date and still does not exist, * set the FORCE flag on the parents. * * If the child wasn't made, the youngestChild field of the parent will be * altered if the child's mtime is big enough. * * Finally, if the child is the implied source for the parent, the * parent's IMPSRC variable is set appropriately. */ void Make_Update(GNode *cgn) { - const char *cname; /* the child's name */ - time_t mtime = -1; - GNodeList *parents; - GNodeListNode *ln; - GNode *centurion; - - /* It is save to re-examine any nodes again */ - checked_seqno++; - - cname = GNode_VarTarget(cgn); - - DEBUG2(MAKE, "Make_Update: %s%s\n", cgn->name, cgn->cohort_num); - - /* - * If the child was actually made, see what its modification time is - * now -- some rules won't actually update the file. If the file still - * doesn't exist, make its mtime now. - */ - if (cgn->made != UPTODATE) { - mtime = Make_Recheck(cgn); - } - - /* - * If this is a `::' node, we must consult its first instance - * which is where all parents are linked. - */ - if ((centurion = cgn->centurion) != NULL) { - if (!Lst_IsEmpty(cgn->parents)) - Punt("%s%s: cohort has parents", cgn->name, cgn->cohort_num); - centurion->unmade_cohorts--; - if (centurion->unmade_cohorts < 0) - Error("Graph cycles through centurion %s", centurion->name); - } else { - centurion = cgn; - } - parents = centurion->parents; - - /* If this was a .ORDER node, schedule the RHS */ - Lst_ForEachUntil(centurion->order_succ, MakeBuildParent, toBeMade->first); - - /* Now mark all the parents as having one less unmade child */ - for (ln = parents->first; ln != NULL; ln = ln->next) { - GNode *pgn = ln->datum; + const char *cname; /* the child's name */ + time_t mtime = -1; + GNodeList *parents; + GNodeListNode *ln; + GNode *centurion; - if (DEBUG(MAKE)) { - debug_printf("inspect parent %s%s: ", pgn->name, pgn->cohort_num); - GNode_FprintDetails(opts.debug_file, "", pgn, ""); - debug_printf(", unmade %d ", pgn->unmade - 1); - } + /* It is save to re-examine any nodes again */ + checked_seqno++; - if (!(pgn->flags & REMAKE)) { - /* This parent isn't needed */ - DEBUG0(MAKE, "- not needed\n"); - continue; - } - if (mtime == 0 && !(cgn->type & OP_WAIT)) - pgn->flags |= FORCE; + cname = GNode_VarTarget(cgn); + + DEBUG2(MAKE, "Make_Update: %s%s\n", cgn->name, cgn->cohort_num); /* - * If the parent has the .MADE attribute, its timestamp got - * updated to that of its newest child, and its unmade - * child count got set to zero in Make_ExpandUse(). - * However other things might cause us to build one of its - * children - and so we mustn't do any processing here when - * the child build finishes. + * If the child was actually made, see what its modification time is + * now -- some rules won't actually update the file. If the file + * still doesn't exist, make its mtime now. */ - if (pgn->type & OP_MADE) { - DEBUG0(MAKE, "- .MADE\n"); - continue; - } - - if (!(cgn->type & (OP_EXEC | OP_USE | OP_USEBEFORE))) { - if (cgn->made == MADE) - pgn->flags |= CHILDMADE; - GNode_UpdateYoungestChild(pgn, cgn); + if (cgn->made != UPTODATE) { + mtime = Make_Recheck(cgn); } /* - * A parent must wait for the completion of all instances - * of a `::' dependency. + * If this is a `::' node, we must consult its first instance + * which is where all parents are linked. */ - if (centurion->unmade_cohorts != 0 || centurion->made < MADE) { - DEBUG2(MAKE, "- centurion made %d, %d unmade cohorts\n", - centurion->made, centurion->unmade_cohorts); - continue; + if ((centurion = cgn->centurion) != NULL) { + if (!Lst_IsEmpty(&cgn->parents)) + Punt("%s%s: cohort has parents", cgn->name, + cgn->cohort_num); + centurion->unmade_cohorts--; + if (centurion->unmade_cohorts < 0) + Error("Graph cycles through centurion %s", + centurion->name); + } else { + centurion = cgn; } + parents = ¢urion->parents; + + /* If this was a .ORDER node, schedule the RHS */ + ScheduleOrderSuccessors(centurion); + + /* Now mark all the parents as having one less unmade child */ + for (ln = parents->first; ln != NULL; ln = ln->next) { + GNode *pgn = ln->datum; + + if (DEBUG(MAKE)) { + debug_printf("inspect parent %s%s: ", pgn->name, + pgn->cohort_num); + GNode_FprintDetails(opts.debug_file, "", pgn, ""); + debug_printf(", unmade %d ", pgn->unmade - 1); + } + + if (!(pgn->flags & REMAKE)) { + /* This parent isn't needed */ + DEBUG0(MAKE, "- not needed\n"); + continue; + } + if (mtime == 0 && !(cgn->type & OP_WAIT)) + pgn->flags |= FORCE; - /* One more child of this parent is now made */ - pgn->unmade--; - if (pgn->unmade < 0) { - if (DEBUG(MAKE)) { - debug_printf("Graph cycles through %s%s\n", - pgn->name, pgn->cohort_num); - Targ_PrintGraph(2); - } - Error("Graph cycles through %s%s", pgn->name, pgn->cohort_num); - } + /* + * If the parent has the .MADE attribute, its timestamp got + * updated to that of its newest child, and its unmade + * child count got set to zero in Make_ExpandUse(). + * However other things might cause us to build one of its + * children - and so we mustn't do any processing here when + * the child build finishes. + */ + if (pgn->type & OP_MADE) { + DEBUG0(MAKE, "- .MADE\n"); + continue; + } - /* We must always rescan the parents of .WAIT and .ORDER nodes. */ - if (pgn->unmade != 0 && !(centurion->type & OP_WAIT) - && !(centurion->flags & DONE_ORDER)) { - DEBUG0(MAKE, "- unmade children\n"); - continue; - } - if (pgn->made != DEFERRED) { - /* - * Either this parent is on a different branch of the tree, - * or it on the RHS of a .WAIT directive - * or it is already on the toBeMade list. - */ - DEBUG0(MAKE, "- not deferred\n"); - continue; - } + if (!(cgn->type & (OP_EXEC | OP_USE | OP_USEBEFORE))) { + if (cgn->made == MADE) + pgn->flags |= CHILDMADE; + GNode_UpdateYoungestChild(pgn, cgn); + } - if (IsWaitingForOrder(pgn)) - continue; + /* + * A parent must wait for the completion of all instances + * of a `::' dependency. + */ + if (centurion->unmade_cohorts != 0 || + !GNode_IsDone(centurion)) { + DEBUG2(MAKE, + "- centurion made %d, %d unmade cohorts\n", + centurion->made, centurion->unmade_cohorts); + continue; + } + + /* One more child of this parent is now made */ + pgn->unmade--; + if (pgn->unmade < 0) { + if (DEBUG(MAKE)) { + debug_printf("Graph cycles through %s%s\n", + pgn->name, pgn->cohort_num); + Targ_PrintGraph(2); + } + Error("Graph cycles through %s%s", pgn->name, + pgn->cohort_num); + } - if (DEBUG(MAKE)) { - debug_printf("- %s%s made, schedule %s%s (made %d)\n", - cgn->name, cgn->cohort_num, - pgn->name, pgn->cohort_num, pgn->made); - Targ_PrintNode(pgn, 2); + /* + * We must always rescan the parents of .WAIT and .ORDER + * nodes. + */ + if (pgn->unmade != 0 && !(centurion->type & OP_WAIT) + && !(centurion->flags & DONE_ORDER)) { + DEBUG0(MAKE, "- unmade children\n"); + continue; + } + if (pgn->made != DEFERRED) { + /* + * Either this parent is on a different branch of + * the tree, or it on the RHS of a .WAIT directive + * or it is already on the toBeMade list. + */ + DEBUG0(MAKE, "- not deferred\n"); + continue; + } + + if (IsWaitingForOrder(pgn)) + continue; + + if (DEBUG(MAKE)) { + debug_printf("- %s%s made, schedule %s%s (made %d)\n", + cgn->name, cgn->cohort_num, + pgn->name, pgn->cohort_num, pgn->made); + Targ_PrintNode(pgn, 2); + } + /* Ok, we can schedule the parent again */ + pgn->made = REQUESTED; + Lst_Enqueue(&toBeMade, pgn); } - /* Ok, we can schedule the parent again */ - pgn->made = REQUESTED; - Lst_Enqueue(toBeMade, pgn); - } - UpdateImplicitParentsVars(cgn, cname); + UpdateImplicitParentsVars(cgn, cname); } static void UnmarkChildren(GNode *gn) { - GNodeListNode *ln; + GNodeListNode *ln; - for (ln = gn->children->first; ln != NULL; ln = ln->next) { - GNode *child = ln->datum; - child->type &= ~OP_MARK; - } + for (ln = gn->children.first; ln != NULL; ln = ln->next) { + GNode *child = ln->datum; + child->type &= ~OP_MARK; + } } -/* Add a child's name to the ALLSRC and OODATE variables of the given +/* + * Add a child's name to the ALLSRC and OODATE variables of the given * node, but only if it has not been given the .EXEC, .USE or .INVISIBLE * attributes. .EXEC and .USE children are very rarely going to be files, * so... * * If the child is a .JOIN node, its ALLSRC is propagated to the parent. * * A child is added to the OODATE variable if its modification time is * later than that of its parent, as defined by Make, except if the * parent is a .JOIN node. In that case, it is only added to the OODATE * variable if it was actually made (since .JOIN nodes don't have * modification times, the comparison is rather unfair...).. * * Input: * cgn The child to add * pgn The parent to whose ALLSRC variable it should * be added */ static void MakeAddAllSrc(GNode *cgn, GNode *pgn) { - if (cgn->type & OP_MARK) - return; - cgn->type |= OP_MARK; - - if (!(cgn->type & (OP_EXEC|OP_USE|OP_USEBEFORE|OP_INVISIBLE))) { - const char *child, *allsrc; - - if (cgn->type & OP_ARCHV) - child = GNode_VarMember(cgn); - else - child = GNode_Path(cgn); - if (cgn->type & OP_JOIN) { - allsrc = GNode_VarAllsrc(cgn); - } else { - allsrc = child; + if (cgn->type & OP_MARK) + return; + cgn->type |= OP_MARK; + + if (!(cgn->type & (OP_EXEC | OP_USE | OP_USEBEFORE | OP_INVISIBLE))) { + const char *child, *allsrc; + + if (cgn->type & OP_ARCHV) + child = GNode_VarMember(cgn); + else + child = GNode_Path(cgn); + if (cgn->type & OP_JOIN) { + allsrc = GNode_VarAllsrc(cgn); + } else { + allsrc = child; + } + if (allsrc != NULL) + Var_Append(ALLSRC, allsrc, pgn); + if (pgn->type & OP_JOIN) { + if (cgn->made == MADE) { + Var_Append(OODATE, child, pgn); + } + } else if ((pgn->mtime < cgn->mtime) || + (cgn->mtime >= now && cgn->made == MADE)) { + /* + * It goes in the OODATE variable if the parent is + * younger than the child or if the child has been + * modified more recently than the start of the make. + * This is to keep pmake from getting confused if + * something else updates the parent after the make + * starts (shouldn't happen, I know, but sometimes it + * does). In such a case, if we've updated the child, + * the parent is likely to have a modification time + * later than that of the child and anything that + * relies on the OODATE variable will be hosed. + * + * XXX: This will cause all made children to go in + * the OODATE variable, even if they're not touched, + * if RECHECK isn't defined, since cgn->mtime is set + * to now in Make_Update. According to some people, + * this is good... + */ + Var_Append(OODATE, child, pgn); + } } - if (allsrc != NULL) - Var_Append(ALLSRC, allsrc, pgn); - if (pgn->type & OP_JOIN) { - if (cgn->made == MADE) { - Var_Append(OODATE, child, pgn); - } - } else if ((pgn->mtime < cgn->mtime) || - (cgn->mtime >= now && cgn->made == MADE)) - { - /* - * It goes in the OODATE variable if the parent is younger than the - * child or if the child has been modified more recently than - * the start of the make. This is to keep pmake from getting - * confused if something else updates the parent after the - * make starts (shouldn't happen, I know, but sometimes it - * does). In such a case, if we've updated the child, the parent - * is likely to have a modification time later than that of - * the child and anything that relies on the OODATE variable will - * be hosed. - * - * XXX: This will cause all made children to go in the OODATE - * variable, even if they're not touched, if RECHECK isn't defined, - * since cgn->mtime is set to now in Make_Update. According to - * some people, this is good... - */ - Var_Append(OODATE, child, pgn); - } - } } -/* Set up the ALLSRC and OODATE variables. Sad to say, it must be +/* + * Set up the ALLSRC and OODATE variables. Sad to say, it must be * done separately, rather than while traversing the graph. This is * because Make defined OODATE to contain all sources whose modification * times were later than that of the target, *not* those sources that * were out-of-date. Since in both compatibility and native modes, * the modification time of the parent isn't found until the child * has been dealt with, we have to wait until now to fill in the * variable. As for ALLSRC, the ordering is important and not * guaranteed when in native mode, so it must be set here, too. * * If the node is a .JOIN node, its TARGET variable will be set to * match its ALLSRC variable. */ void Make_DoAllVar(GNode *gn) { - GNodeListNode *ln; + GNodeListNode *ln; - if (gn->flags & DONE_ALLSRC) - return; + if (gn->flags & DONE_ALLSRC) + return; - UnmarkChildren(gn); - for (ln = gn->children->first; ln != NULL; ln = ln->next) - MakeAddAllSrc(ln->datum, gn); + UnmarkChildren(gn); + for (ln = gn->children.first; ln != NULL; ln = ln->next) + MakeAddAllSrc(ln->datum, gn); - if (!Var_Exists(OODATE, gn)) - Var_Set(OODATE, "", gn); - if (!Var_Exists(ALLSRC, gn)) - Var_Set(ALLSRC, "", gn); + if (!Var_Exists(OODATE, gn)) + Var_Set(OODATE, "", gn); + if (!Var_Exists(ALLSRC, gn)) + Var_Set(ALLSRC, "", gn); - if (gn->type & OP_JOIN) - Var_Set(TARGET, GNode_VarAllsrc(gn), gn); - gn->flags |= DONE_ALLSRC; + if (gn->type & OP_JOIN) + Var_Set(TARGET, GNode_VarAllsrc(gn), gn); + gn->flags |= DONE_ALLSRC; } static int -MakeBuildChild(void *v_cn, void *toBeMade_next) +MakeBuildChild(GNode *cn, GNodeListNode *toBeMadeNext) { - GNode *cn = v_cn; - - if (DEBUG(MAKE)) { - debug_printf("MakeBuildChild: inspect %s%s, ", - cn->name, cn->cohort_num); - GNode_FprintDetails(opts.debug_file, "", cn, "\n"); - } - if (cn->made > DEFERRED) - return 0; - /* If this node is on the RHS of a .ORDER, check LHSs. */ - if (IsWaitingForOrder(cn)) { - /* Can't build this (or anything else in this child list) yet */ - cn->made = DEFERRED; - return 0; /* but keep looking */ - } - - DEBUG2(MAKE, "MakeBuildChild: schedule %s%s\n", cn->name, cn->cohort_num); - - cn->made = REQUESTED; - if (toBeMade_next == NULL) - Lst_Append(toBeMade, cn); - else - Lst_InsertBefore(toBeMade, toBeMade_next, cn); - - if (cn->unmade_cohorts != 0) - Lst_ForEachUntil(cn->cohorts, MakeBuildChild, toBeMade_next); - - /* - * If this node is a .WAIT node with unmade children - * then don't add the next sibling. - */ - return cn->type & OP_WAIT && cn->unmade > 0; + if (DEBUG(MAKE)) { + debug_printf("MakeBuildChild: inspect %s%s, ", + cn->name, cn->cohort_num); + GNode_FprintDetails(opts.debug_file, "", cn, "\n"); + } + if (GNode_IsReady(cn)) + return 0; + + /* If this node is on the RHS of a .ORDER, check LHSs. */ + if (IsWaitingForOrder(cn)) { + /* Can't build this (or anything else in this child list) yet */ + cn->made = DEFERRED; + return 0; /* but keep looking */ + } + + DEBUG2(MAKE, "MakeBuildChild: schedule %s%s\n", + cn->name, cn->cohort_num); + + cn->made = REQUESTED; + if (toBeMadeNext == NULL) + Lst_Append(&toBeMade, cn); + else + Lst_InsertBefore(&toBeMade, toBeMadeNext, cn); + + if (cn->unmade_cohorts != 0) { + ListNode *ln; + + for (ln = cn->cohorts.first; ln != NULL; ln = ln->next) + if (MakeBuildChild(ln->datum, toBeMadeNext) != 0) + break; + } + + /* + * If this node is a .WAIT node with unmade children + * then don't add the next sibling. + */ + return cn->type & OP_WAIT && cn->unmade > 0; } /* When a .ORDER LHS node completes, we do this on each RHS. */ static int -MakeBuildParent(void *v_pn, void *toBeMade_next) +MakeBuildParent(GNode *pn, GNodeListNode *toBeMadeNext) { - GNode *pn = v_pn; + if (pn->made != DEFERRED) + return 0; + + if (MakeBuildChild(pn, toBeMadeNext) == 0) { + /* When this node is built, reschedule its parents. */ + pn->flags |= DONE_ORDER; + } - if (pn->made != DEFERRED) return 0; +} - if (MakeBuildChild(pn, toBeMade_next) == 0) { - /* Mark so that when this node is built we reschedule its parents */ - pn->flags |= DONE_ORDER; - } +static void +MakeChildren(GNode *gn) +{ + GNodeListNode *toBeMadeNext = toBeMade.first; + GNodeListNode *ln; - return 0; + for (ln = gn->children.first; ln != NULL; ln = ln->next) + if (MakeBuildChild(ln->datum, toBeMadeNext) != 0) + break; } -/* Start as many jobs as possible, taking them from the toBeMade queue. +/* + * Start as many jobs as possible, taking them from the toBeMade queue. * * If the -q option was given, no job will be started, * but as soon as an out-of-date target is found, this function * returns TRUE. In all other cases, this function returns FALSE. */ static Boolean MakeStartJobs(void) { - GNode *gn; - Boolean have_token = FALSE; - - while (!Lst_IsEmpty(toBeMade)) { - /* Get token now to avoid cycling job-list when we only have 1 token */ - if (!have_token && !Job_TokenWithdraw()) - break; - have_token = TRUE; - - gn = Lst_Dequeue(toBeMade); - DEBUG2(MAKE, "Examining %s%s...\n", gn->name, gn->cohort_num); - - if (gn->made != REQUESTED) { - DEBUG1(MAKE, "state %d\n", gn->made); - - make_abort(gn, __LINE__); - } - - if (gn->checked_seqno == checked_seqno) { - /* We've already looked at this node since a job finished... */ - DEBUG2(MAKE, "already checked %s%s\n", gn->name, gn->cohort_num); - gn->made = DEFERRED; - continue; - } - gn->checked_seqno = checked_seqno; - - if (gn->unmade != 0) { - /* - * We can't build this yet, add all unmade children to toBeMade, - * just before the current first element. - */ - gn->made = DEFERRED; - Lst_ForEachUntil(gn->children, MakeBuildChild, toBeMade->first); - /* and drop this node on the floor */ - DEBUG2(MAKE, "dropped %s%s\n", gn->name, gn->cohort_num); - continue; - } + GNode *gn; + Boolean have_token = FALSE; - gn->made = BEINGMADE; - if (GNode_IsOODate(gn)) { - DEBUG0(MAKE, "out-of-date\n"); - if (opts.queryFlag) - return TRUE; - Make_DoAllVar(gn); - Job_Make(gn); - have_token = FALSE; - } else { - DEBUG0(MAKE, "up-to-date\n"); - gn->made = UPTODATE; - if (gn->type & OP_JOIN) { + while (!Lst_IsEmpty(&toBeMade)) { /* - * Even for an up-to-date .JOIN node, we need it to have its - * context variables so references to it get the correct - * value for .TARGET when building up the context variables - * of its parent(s)... + * Get token now to avoid cycling job-list when we only + * have 1 token */ - Make_DoAllVar(gn); - } - Make_Update(gn); + if (!have_token && !Job_TokenWithdraw()) + break; + have_token = TRUE; + + gn = Lst_Dequeue(&toBeMade); + DEBUG2(MAKE, "Examining %s%s...\n", gn->name, gn->cohort_num); + + if (gn->made != REQUESTED) { + /* + * XXX: Replace %d with string representation; + * see made_name. + */ + DEBUG1(MAKE, "state %d\n", gn->made); + + make_abort(gn, __LINE__); + } + + if (gn->checked_seqno == checked_seqno) { + /* + * We've already looked at this node since a job + * finished... + */ + DEBUG2(MAKE, "already checked %s%s\n", gn->name, + gn->cohort_num); + gn->made = DEFERRED; + continue; + } + gn->checked_seqno = checked_seqno; + + if (gn->unmade != 0) { + /* + * We can't build this yet, add all unmade children + * to toBeMade, just before the current first element. + */ + gn->made = DEFERRED; + + MakeChildren(gn); + + /* and drop this node on the floor */ + DEBUG2(MAKE, "dropped %s%s\n", gn->name, + gn->cohort_num); + continue; + } + + gn->made = BEINGMADE; + if (GNode_IsOODate(gn)) { + DEBUG0(MAKE, "out-of-date\n"); + if (opts.queryFlag) + return TRUE; + Make_DoAllVar(gn); + Job_Make(gn); + have_token = FALSE; + } else { + DEBUG0(MAKE, "up-to-date\n"); + gn->made = UPTODATE; + if (gn->type & OP_JOIN) { + /* + * Even for an up-to-date .JOIN node, we + * need it to have its context variables so + * references to it get the correct value + * for .TARGET when building up the context + * variables of its parent(s)... + */ + Make_DoAllVar(gn); + } + Make_Update(gn); + } } - } - if (have_token) - Job_TokenReturn(); + if (have_token) + Job_TokenReturn(); - return FALSE; + return FALSE; } /* Print the status of a .ORDER node. */ static void MakePrintStatusOrderNode(GNode *ogn, GNode *gn) { - if (!(ogn->flags & REMAKE) || ogn->made > REQUESTED) - /* not waiting for this one */ - return; - - printf(" `%s%s' has .ORDER dependency against %s%s ", - gn->name, gn->cohort_num, ogn->name, ogn->cohort_num); - GNode_FprintDetails(stdout, "(", ogn, ")\n"); - - if (DEBUG(MAKE) && opts.debug_file != stdout) { - debug_printf(" `%s%s' has .ORDER dependency against %s%s ", - gn->name, gn->cohort_num, ogn->name, ogn->cohort_num); - GNode_FprintDetails(opts.debug_file, "(", ogn, ")\n"); - } + if (!GNode_IsWaitingFor(ogn)) + return; + + printf(" `%s%s' has .ORDER dependency against %s%s ", + gn->name, gn->cohort_num, ogn->name, ogn->cohort_num); + GNode_FprintDetails(stdout, "(", ogn, ")\n"); + + if (DEBUG(MAKE) && opts.debug_file != stdout) { + debug_printf(" `%s%s' has .ORDER dependency against %s%s ", + gn->name, gn->cohort_num, ogn->name, ogn->cohort_num); + GNode_FprintDetails(opts.debug_file, "(", ogn, ")\n"); + } } static void MakePrintStatusOrder(GNode *gn) { - GNodeListNode *ln; - for (ln = gn->order_pred->first; ln != NULL; ln = ln->next) - MakePrintStatusOrderNode(ln->datum, gn); + GNodeListNode *ln; + for (ln = gn->order_pred.first; ln != NULL; ln = ln->next) + MakePrintStatusOrderNode(ln->datum, gn); } static void MakePrintStatusList(GNodeList *, int *); -/* Print the status of a top-level node, viz. it being up-to-date already +/* + * Print the status of a top-level node, viz. it being up-to-date already * or not created due to an error in a lower level. - * Callback function for Make_Run via Lst_ForEachUntil. */ static Boolean MakePrintStatus(GNode *gn, int *errors) { - if (gn->flags & DONECYCLE) - /* We've completely processed this node before, don't do it again. */ - return FALSE; + if (gn->flags & DONECYCLE) { + /* + * We've completely processed this node before, don't do + * it again. + */ + return FALSE; + } - if (gn->unmade == 0) { - gn->flags |= DONECYCLE; - switch (gn->made) { - case UPTODATE: - printf("`%s%s' is up to date.\n", gn->name, gn->cohort_num); - break; - case MADE: - break; - case UNMADE: - case DEFERRED: - case REQUESTED: - case BEINGMADE: - (*errors)++; - printf("`%s%s' was not built", gn->name, gn->cohort_num); - GNode_FprintDetails(stdout, " (", gn, ")!\n"); - if (DEBUG(MAKE) && opts.debug_file != stdout) { - debug_printf("`%s%s' was not built", gn->name, gn->cohort_num); - GNode_FprintDetails(opts.debug_file, " (", gn, ")!\n"); - } - /* Most likely problem is actually caused by .ORDER */ - MakePrintStatusOrder(gn); - break; - default: - /* Errors - already counted */ - printf("`%s%s' not remade because of errors.\n", - gn->name, gn->cohort_num); - if (DEBUG(MAKE) && opts.debug_file != stdout) - debug_printf("`%s%s' not remade because of errors.\n", - gn->name, gn->cohort_num); - break; + if (gn->unmade == 0) { + gn->flags |= DONECYCLE; + switch (gn->made) { + case UPTODATE: + printf("`%s%s' is up to date.\n", gn->name, + gn->cohort_num); + break; + case MADE: + break; + case UNMADE: + case DEFERRED: + case REQUESTED: + case BEINGMADE: + (*errors)++; + printf("`%s%s' was not built", gn->name, + gn->cohort_num); + GNode_FprintDetails(stdout, " (", gn, ")!\n"); + if (DEBUG(MAKE) && opts.debug_file != stdout) { + debug_printf("`%s%s' was not built", gn->name, + gn->cohort_num); + GNode_FprintDetails(opts.debug_file, " (", gn, + ")!\n"); + } + /* Most likely problem is actually caused by .ORDER */ + MakePrintStatusOrder(gn); + break; + default: + /* Errors - already counted */ + printf("`%s%s' not remade because of errors.\n", + gn->name, gn->cohort_num); + if (DEBUG(MAKE) && opts.debug_file != stdout) + debug_printf( + "`%s%s' not remade because of errors.\n", + gn->name, gn->cohort_num); + break; + } + return FALSE; } - return FALSE; - } - - DEBUG3(MAKE, "MakePrintStatus: %s%s has %d unmade children\n", - gn->name, gn->cohort_num, gn->unmade); - /* - * If printing cycles and came to one that has unmade children, - * print out the cycle by recursing on its children. - */ - if (!(gn->flags & CYCLE)) { - /* First time we've seen this node, check all children */ - gn->flags |= CYCLE; - MakePrintStatusList(gn->children, errors); - /* Mark that this node needn't be processed again */ + + DEBUG3(MAKE, "MakePrintStatus: %s%s has %d unmade children\n", + gn->name, gn->cohort_num, gn->unmade); + /* + * If printing cycles and came to one that has unmade children, + * print out the cycle by recursing on its children. + */ + if (!(gn->flags & CYCLE)) { + /* First time we've seen this node, check all children */ + gn->flags |= CYCLE; + MakePrintStatusList(&gn->children, errors); + /* Mark that this node needn't be processed again */ + gn->flags |= DONECYCLE; + return FALSE; + } + + /* Only output the error once per node */ gn->flags |= DONECYCLE; + Error("Graph cycles through `%s%s'", gn->name, gn->cohort_num); + if ((*errors)++ > 100) + /* Abandon the whole error report */ + return TRUE; + + /* Reporting for our children will give the rest of the loop */ + MakePrintStatusList(&gn->children, errors); return FALSE; - } - - /* Only output the error once per node */ - gn->flags |= DONECYCLE; - Error("Graph cycles through `%s%s'", gn->name, gn->cohort_num); - if ((*errors)++ > 100) - /* Abandon the whole error report */ - return TRUE; - - /* Reporting for our children will give the rest of the loop */ - MakePrintStatusList(gn->children, errors); - return FALSE; } static void MakePrintStatusList(GNodeList *gnodes, int *errors) { - GNodeListNode *ln; - for (ln = gnodes->first; ln != NULL; ln = ln->next) - if (MakePrintStatus(ln->datum, errors)) - break; + GNodeListNode *ln; + + for (ln = gnodes->first; ln != NULL; ln = ln->next) + if (MakePrintStatus(ln->datum, errors)) + break; } static void ExamineLater(GNodeList *examine, GNodeList *toBeExamined) { - ListNode *ln; + ListNode *ln; - for (ln = toBeExamined->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; + for (ln = toBeExamined->first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; - if (gn->flags & REMAKE) - continue; - if (gn->type & (OP_USE | OP_USEBEFORE)) - continue; + if (gn->flags & REMAKE) + continue; + if (gn->type & (OP_USE | OP_USEBEFORE)) + continue; - DEBUG2(MAKE, "ExamineLater: need to examine \"%s%s\"\n", - gn->name, gn->cohort_num); - Lst_Enqueue(examine, gn); - } + DEBUG2(MAKE, "ExamineLater: need to examine \"%s%s\"\n", + gn->name, gn->cohort_num); + Lst_Enqueue(examine, gn); + } } -/* Expand .USE nodes and create a new targets list. +/* + * Expand .USE nodes and create a new targets list. * * Input: * targs the initial list of targets */ void Make_ExpandUse(GNodeList *targs) { - GNodeList *examine = Lst_New(); /* Queue of targets to examine */ - Lst_AppendAll(examine, targs); - - /* - * Make an initial downward pass over the graph, marking nodes to be made - * as we go down. We call Suff_FindDeps to find where a node is and - * to get some children for it if it has none and also has no commands. - * If the node is a leaf, we stick it on the toBeMade queue to - * be looked at in a minute, otherwise we add its children to our queue - * and go on about our business. - */ - while (!Lst_IsEmpty(examine)) { - GNode *gn = Lst_Dequeue(examine); - - if (gn->flags & REMAKE) - /* We've looked at this one already */ - continue; - gn->flags |= REMAKE; - DEBUG2(MAKE, "Make_ExpandUse: examine %s%s\n", - gn->name, gn->cohort_num); - - if (gn->type & OP_DOUBLEDEP) - Lst_PrependAll(examine, gn->cohorts); + GNodeList examine = LST_INIT; /* Queue of targets to examine */ + Lst_AppendAll(&examine, targs); /* - * Apply any .USE rules before looking for implicit dependencies - * to make sure everything has commands that should... - * Make sure that the TARGET is set, so that we can make - * expansions. + * Make an initial downward pass over the graph, marking nodes to + * be made as we go down. + * + * We call Suff_FindDeps to find where a node is and to get some + * children for it if it has none and also has no commands. If the + * node is a leaf, we stick it on the toBeMade queue to be looked + * at in a minute, otherwise we add its children to our queue and + * go on about our business. */ - if (gn->type & OP_ARCHV) { - char *eoa = strchr(gn->name, '('); - char *eon = strchr(gn->name, ')'); - if (eoa == NULL || eon == NULL) - continue; - *eoa = '\0'; - *eon = '\0'; - Var_Set(MEMBER, eoa + 1, gn); - Var_Set(ARCHIVE, gn->name, gn); - *eoa = '('; - *eon = ')'; - } + while (!Lst_IsEmpty(&examine)) { + GNode *gn = Lst_Dequeue(&examine); + + if (gn->flags & REMAKE) + /* We've looked at this one already */ + continue; + gn->flags |= REMAKE; + DEBUG2(MAKE, "Make_ExpandUse: examine %s%s\n", + gn->name, gn->cohort_num); - Dir_UpdateMTime(gn, FALSE); - Var_Set(TARGET, GNode_Path(gn), gn); - UnmarkChildren(gn); - HandleUseNodes(gn); - - if (!(gn->type & OP_MADE)) - Suff_FindDeps(gn); - else { - PretendAllChildrenAreMade(gn); - if (gn->unmade != 0) - printf("Warning: %s%s still has %d unmade children\n", - gn->name, gn->cohort_num, gn->unmade); - } + if (gn->type & OP_DOUBLEDEP) + Lst_PrependAll(&examine, &gn->cohorts); - if (gn->unmade != 0) - ExamineLater(examine, gn->children); - } + /* + * Apply any .USE rules before looking for implicit + * dependencies to make sure everything has commands that + * should. + * + * Make sure that the TARGET is set, so that we can make + * expansions. + */ + if (gn->type & OP_ARCHV) { + char *eoa = strchr(gn->name, '('); + char *eon = strchr(gn->name, ')'); + if (eoa == NULL || eon == NULL) + continue; + *eoa = '\0'; + *eon = '\0'; + Var_Set(MEMBER, eoa + 1, gn); + Var_Set(ARCHIVE, gn->name, gn); + *eoa = '('; + *eon = ')'; + } + + Dir_UpdateMTime(gn, FALSE); + Var_Set(TARGET, GNode_Path(gn), gn); + UnmarkChildren(gn); + HandleUseNodes(gn); + + if (!(gn->type & OP_MADE)) + Suff_FindDeps(gn); + else { + PretendAllChildrenAreMade(gn); + if (gn->unmade != 0) { + printf( + "Warning: " + "%s%s still has %d unmade children\n", + gn->name, gn->cohort_num, gn->unmade); + } + } + + if (gn->unmade != 0) + ExamineLater(&examine, &gn->children); + } - Lst_Free(examine); + Lst_Done(&examine); } /* Make the .WAIT node depend on the previous children */ static void add_wait_dependency(GNodeListNode *owln, GNode *wn) { - GNodeListNode *cln; - GNode *cn; - - for (cln = owln; (cn = cln->datum) != wn; cln = cln->next) { - DEBUG3(MAKE, ".WAIT: add dependency %s%s -> %s\n", - cn->name, cn->cohort_num, wn->name); - - /* XXX: This pattern should be factored out, it repeats often */ - Lst_Append(wn->children, cn); - wn->unmade++; - Lst_Append(cn->parents, wn); - } + GNodeListNode *cln; + GNode *cn; + + for (cln = owln; (cn = cln->datum) != wn; cln = cln->next) { + DEBUG3(MAKE, ".WAIT: add dependency %s%s -> %s\n", + cn->name, cn->cohort_num, wn->name); + + /* XXX: This pattern should be factored out, it repeats often */ + Lst_Append(&wn->children, cn); + wn->unmade++; + Lst_Append(&cn->parents, wn); + } } /* Convert .WAIT nodes into dependencies. */ static void Make_ProcessWait(GNodeList *targs) { - GNode *pgn; /* 'parent' node we are examining */ - GNodeListNode *owln; /* Previous .WAIT node */ - GNodeList *examine; /* List of targets to examine */ - - /* - * We need all the nodes to have a common parent in order for the - * .WAIT and .ORDER scheduling to work. - * Perhaps this should be done earlier... - */ - - pgn = GNode_New(".MAIN"); - pgn->flags = REMAKE; - pgn->type = OP_PHONY | OP_DEPENDS; - /* Get it displayed in the diag dumps */ - Lst_Prepend(Targ_List(), pgn); - - { - GNodeListNode *ln; - for (ln = targs->first; ln != NULL; ln = ln->next) { - GNode *cgn = ln->datum; + GNode *pgn; /* 'parent' node we are examining */ + GNodeListNode *owln; /* Previous .WAIT node */ + GNodeList examine; /* List of targets to examine */ + + /* + * We need all the nodes to have a common parent in order for the + * .WAIT and .ORDER scheduling to work. + * Perhaps this should be done earlier... + */ + + pgn = GNode_New(".MAIN"); + pgn->flags = REMAKE; + pgn->type = OP_PHONY | OP_DEPENDS; + /* Get it displayed in the diag dumps */ + Lst_Prepend(Targ_List(), pgn); - Lst_Append(pgn->children, cgn); - Lst_Append(cgn->parents, pgn); - pgn->unmade++; + { + GNodeListNode *ln; + for (ln = targs->first; ln != NULL; ln = ln->next) { + GNode *cgn = ln->datum; + + Lst_Append(&pgn->children, cgn); + Lst_Append(&cgn->parents, pgn); + pgn->unmade++; + } } - } - /* Start building with the 'dummy' .MAIN' node */ - MakeBuildChild(pgn, NULL); + /* Start building with the 'dummy' .MAIN' node */ + MakeBuildChild(pgn, NULL); - examine = Lst_New(); - Lst_Append(examine, pgn); + Lst_Init(&examine); + Lst_Append(&examine, pgn); - while (!Lst_IsEmpty(examine)) { - GNodeListNode *ln; + while (!Lst_IsEmpty(&examine)) { + GNodeListNode *ln; + + pgn = Lst_Dequeue(&examine); - pgn = Lst_Dequeue(examine); - - /* We only want to process each child-list once */ - if (pgn->flags & DONE_WAIT) - continue; - pgn->flags |= DONE_WAIT; - DEBUG1(MAKE, "Make_ProcessWait: examine %s\n", pgn->name); - - if (pgn->type & OP_DOUBLEDEP) - Lst_PrependAll(examine, pgn->cohorts); - - owln = pgn->children->first; - for (ln = pgn->children->first; ln != NULL; ln = ln->next) { - GNode *cgn = ln->datum; - if (cgn->type & OP_WAIT) { - add_wait_dependency(owln, cgn); - owln = ln; - } else { - Lst_Append(examine, cgn); - } + /* We only want to process each child-list once */ + if (pgn->flags & DONE_WAIT) + continue; + pgn->flags |= DONE_WAIT; + DEBUG1(MAKE, "Make_ProcessWait: examine %s\n", pgn->name); + + if (pgn->type & OP_DOUBLEDEP) + Lst_PrependAll(&examine, &pgn->cohorts); + + owln = pgn->children.first; + for (ln = pgn->children.first; ln != NULL; ln = ln->next) { + GNode *cgn = ln->datum; + if (cgn->type & OP_WAIT) { + add_wait_dependency(owln, cgn); + owln = ln; + } else { + Lst_Append(&examine, cgn); + } + } } - } - Lst_Free(examine); + Lst_Done(&examine); } -/*- - *----------------------------------------------------------------------- - * Make_Run -- - * Initialize the nodes to remake and the list of nodes which are - * ready to be made by doing a breadth-first traversal of the graph - * starting from the nodes in the given list. Once this traversal - * is finished, all the 'leaves' of the graph are in the toBeMade - * queue. - * Using this queue and the Job module, work back up the graph, - * calling on MakeStartJobs to keep the job table as full as - * possible. +/* + * Initialize the nodes to remake and the list of nodes which are ready to + * be made by doing a breadth-first traversal of the graph starting from the + * nodes in the given list. Once this traversal is finished, all the 'leaves' + * of the graph are in the toBeMade queue. + * + * Using this queue and the Job module, work back up the graph, calling on + * MakeStartJobs to keep the job table as full as possible. * * Input: * targs the initial list of targets * * Results: * TRUE if work was done. FALSE otherwise. * * Side Effects: * The make field of all nodes involved in the creation of the given * targets is set to 1. The toBeMade list is set to contain all the * 'leaves' of these subgraphs. - *----------------------------------------------------------------------- */ Boolean Make_Run(GNodeList *targs) { - int errors; /* Number of errors the Job module reports */ + int errors; /* Number of errors the Job module reports */ - /* Start trying to make the current targets... */ - toBeMade = Lst_New(); + /* Start trying to make the current targets... */ + Lst_Init(&toBeMade); - Make_ExpandUse(targs); - Make_ProcessWait(targs); + Make_ExpandUse(targs); + Make_ProcessWait(targs); - if (DEBUG(MAKE)) { - debug_printf("#***# full graph\n"); - Targ_PrintGraph(1); - } + if (DEBUG(MAKE)) { + debug_printf("#***# full graph\n"); + Targ_PrintGraph(1); + } - if (opts.queryFlag) { + if (opts.queryFlag) { + /* + * We wouldn't do any work unless we could start some jobs + * in the next loop... (we won't actually start any, of + * course, this is just to see if any of the targets was out + * of date) + */ + return MakeStartJobs(); + } /* - * We wouldn't do any work unless we could start some jobs in the - * next loop... (we won't actually start any, of course, this is just - * to see if any of the targets was out of date) + * Initialization. At the moment, no jobs are running and until some + * get started, nothing will happen since the remaining upward + * traversal of the graph is performed by the routines in job.c upon + * the finishing of a job. So we fill the Job table as much as we can + * before going into our loop. */ - return MakeStartJobs(); - } - /* - * Initialization. At the moment, no jobs are running and until some - * get started, nothing will happen since the remaining upward - * traversal of the graph is performed by the routines in job.c upon - * the finishing of a job. So we fill the Job table as much as we can - * before going into our loop. - */ - (void)MakeStartJobs(); - - /* - * Main Loop: The idea here is that the ending of jobs will take - * care of the maintenance of data structures and the waiting for output - * will cause us to be idle most of the time while our children run as - * much as possible. Because the job table is kept as full as possible, - * the only time when it will be empty is when all the jobs which need - * running have been run, so that is the end condition of this loop. - * Note that the Job module will exit if there were any errors unless the - * keepgoing flag was given. - */ - while (!Lst_IsEmpty(toBeMade) || jobTokensRunning > 0) { - Job_CatchOutput(); (void)MakeStartJobs(); - } - errors = Job_Finish(); + /* + * Main Loop: The idea here is that the ending of jobs will take + * care of the maintenance of data structures and the waiting for + * output will cause us to be idle most of the time while our + * children run as much as possible. Because the job table is kept + * as full as possible, the only time when it will be empty is when + * all the jobs which need running have been run, so that is the end + * condition of this loop. Note that the Job module will exit if + * there were any errors unless the keepgoing flag was given. + */ + while (!Lst_IsEmpty(&toBeMade) || jobTokensRunning > 0) { + Job_CatchOutput(); + (void)MakeStartJobs(); + } - /* - * Print the final status of each target. E.g. if it wasn't made - * because some inferior reported an error. - */ - DEBUG1(MAKE, "done: errors %d\n", errors); - if (errors == 0) { - MakePrintStatusList(targs, &errors); - if (DEBUG(MAKE)) { - debug_printf("done: errors %d\n", errors); - if (errors > 0) - Targ_PrintGraph(4); + errors = Job_Finish(); + + /* + * Print the final status of each target. E.g. if it wasn't made + * because some inferior reported an error. + */ + DEBUG1(MAKE, "done: errors %d\n", errors); + if (errors == 0) { + MakePrintStatusList(targs, &errors); + if (DEBUG(MAKE)) { + debug_printf("done: errors %d\n", errors); + if (errors > 0) + Targ_PrintGraph(4); + } } - } - return errors > 0; + return errors > 0; } diff --git a/make.h b/make.h index 2803ceac3f95..230700a8dd9d 100644 --- a/make.h +++ b/make.h @@ -1,788 +1,868 @@ -/* $NetBSD: make.h,v 1.210 2020/11/16 21:53:10 rillig Exp $ */ +/* $NetBSD: make.h,v 1.242 2021/01/10 21:20:46 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)make.h 8.3 (Berkeley) 6/13/95 */ /* * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)make.h 8.3 (Berkeley) 6/13/95 */ /*- * make.h -- * The global definitions for pmake */ #ifndef MAKE_MAKE_H #define MAKE_MAKE_H #ifdef HAVE_CONFIG_H # include "config.h" #endif #include #include #include #include #include #include #include #include #include #ifdef HAVE_STRING_H #include #else #include #endif #include #include #ifndef FD_CLOEXEC #define FD_CLOEXEC 1 #endif #if defined(__GNUC__) -#define MAKE_GNUC_PREREQ(x, y) \ +#define MAKE_GNUC_PREREQ(x, y) \ ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ (__GNUC__ > (x))) #else /* defined(__GNUC__) */ -#define MAKE_GNUC_PREREQ(x, y) 0 +#define MAKE_GNUC_PREREQ(x, y) 0 #endif /* defined(__GNUC__) */ #if MAKE_GNUC_PREREQ(2, 7) -#define MAKE_ATTR_UNUSED __attribute__((__unused__)) +#define MAKE_ATTR_UNUSED __attribute__((__unused__)) #else -#define MAKE_ATTR_UNUSED /* delete */ +#define MAKE_ATTR_UNUSED /* delete */ #endif #if MAKE_GNUC_PREREQ(2, 5) -#define MAKE_ATTR_DEAD __attribute__((__noreturn__)) +#define MAKE_ATTR_DEAD __attribute__((__noreturn__)) #elif defined(__GNUC__) -#define MAKE_ATTR_DEAD __volatile +#define MAKE_ATTR_DEAD __volatile #else -#define MAKE_ATTR_DEAD /* delete */ +#define MAKE_ATTR_DEAD /* delete */ #endif #if MAKE_GNUC_PREREQ(2, 7) #define MAKE_ATTR_PRINTFLIKE(fmtarg, firstvararg) \ __attribute__((__format__ (__printf__, fmtarg, firstvararg))) #else #define MAKE_ATTR_PRINTFLIKE(fmtarg, firstvararg) /* delete */ #endif #define MAKE_INLINE static inline MAKE_ATTR_UNUSED /* * A boolean type is defined as an integer, not an enum, for historic reasons. * The only allowed values are the constants TRUE and FALSE (1 and 0). */ - -#ifdef USE_DOUBLE_BOOLEAN +#if defined(lint) || defined(USE_C99_BOOLEAN) +#include +typedef bool Boolean; +#define FALSE false +#define TRUE true +#elif defined(USE_DOUBLE_BOOLEAN) /* During development, to find type mismatches in function declarations. */ typedef double Boolean; #define TRUE 1.0 #define FALSE 0.0 #elif defined(USE_UCHAR_BOOLEAN) -/* During development, to find code that depends on the exact value of TRUE or - * that stores other values in Boolean variables. */ +/* + * During development, to find code that depends on the exact value of TRUE or + * that stores other values in Boolean variables. + */ typedef unsigned char Boolean; #define TRUE ((unsigned char)0xFF) #define FALSE ((unsigned char)0x00) #elif defined(USE_CHAR_BOOLEAN) -/* During development, to find code that uses a boolean as array index, via - * -Wchar-subscripts. */ +/* + * During development, to find code that uses a boolean as array index, via + * -Wchar-subscripts. + */ typedef char Boolean; #define TRUE ((char)-1) #define FALSE ((char)0x00) #elif defined(USE_ENUM_BOOLEAN) typedef enum Boolean { FALSE, TRUE } Boolean; #else typedef int Boolean; #ifndef TRUE #define TRUE 1 #endif #ifndef FALSE #define FALSE 0 #endif #endif #include "lst.h" #include "enum.h" #include "hash.h" #include "make-conf.h" #include "buf.h" #include "make_malloc.h" /* * some vendors don't have this --sjg */ #if defined(S_IFDIR) && !defined(S_ISDIR) # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif #if defined(sun) && (defined(__svr4__) || defined(__SVR4)) -#define POSIX_SIGNALS +# define POSIX_SIGNALS #endif +/* + * The typical flow of states is: + * + * The direct successful path: + * UNMADE -> BEINGMADE -> MADE. + * + * The direct error path: + * UNMADE -> BEINGMADE -> ERROR. + * + * The successful path when dependencies need to be made first: + * UNMADE -> DEFERRED -> REQUESTED -> BEINGMADE -> MADE. + * + * A node that has dependencies, and one of the dependencies cannot be made: + * UNMADE -> DEFERRED -> ABORTED. + * + * A node that turns out to be up-to-date: + * UNMADE -> BEINGMADE -> UPTODATE. + */ typedef enum GNodeMade { - UNMADE, /* Not examined yet */ - DEFERRED, /* Examined once (building child) */ - REQUESTED, /* on toBeMade list */ - BEINGMADE, /* Target is already being made. - * Indicates a cycle in the graph. */ - MADE, /* Was out-of-date and has been made */ - UPTODATE, /* Was already up-to-date */ - ERROR, /* An error occurred while it was being - * made (used only in compat mode) */ - ABORTED /* The target was aborted due to an error - * making an inferior (compat). */ + /* Not examined yet. */ + UNMADE, + /* The node has been examined but is not yet ready since its + * dependencies have to be made first. */ + DEFERRED, + + /* The node is on the toBeMade list. */ + REQUESTED, + + /* The node is already being made. Trying to build a node in this + * state indicates a cycle in the graph. */ + BEINGMADE, + + /* Was out-of-date and has been made. */ + MADE, + /* Was already up-to-date, does not need to be made. */ + UPTODATE, + /* An error occurred while it was being made. + * Used only in compat mode. */ + ERROR, + /* The target was aborted due to an error making a dependency. + * Used only in compat mode. */ + ABORTED } GNodeMade; -/* The OP_ constants are used when parsing a dependency line as a way of +/* + * The OP_ constants are used when parsing a dependency line as a way of * communicating to other parts of the program the way in which a target * should be made. * - * Some of the OP_ constants can be combined, others cannot. */ + * Some of the OP_ constants can be combined, others cannot. + */ typedef enum GNodeType { - OP_NONE = 0, - - /* The dependency operator ':' is the most common one. The commands of - * this node are executed if any child is out-of-date. */ - OP_DEPENDS = 1 << 0, - /* The dependency operator '!' always executes its commands, even if - * its children are up-to-date. */ - OP_FORCE = 1 << 1, - /* The dependency operator '::' behaves like ':', except that it allows - * multiple dependency groups to be defined. Each of these groups is - * executed on its own, independently from the others. Each individual - * dependency group is called a cohort. */ - OP_DOUBLEDEP = 1 << 2, - - /* Matches the dependency operators ':', '!' and '::'. */ - OP_OPMASK = OP_DEPENDS|OP_FORCE|OP_DOUBLEDEP, - - /* Don't care if the target doesn't exist and can't be created */ - OP_OPTIONAL = 1 << 3, - /* Use associated commands for parents */ - OP_USE = 1 << 4, - /* Target is never out of date, but always execute commands anyway. - * Its time doesn't matter, so it has none...sort of */ - OP_EXEC = 1 << 5, - /* Ignore non-zero exit status from shell commands when creating the node */ - OP_IGNORE = 1 << 6, - /* Don't remove the target when interrupted */ - OP_PRECIOUS = 1 << 7, - /* Don't echo commands when executed */ - OP_SILENT = 1 << 8, - /* Target is a recursive make so its commands should always be executed - * when it is out of date, regardless of the state of the -n or -t flags */ - OP_MAKE = 1 << 9, - /* Target is out-of-date only if any of its children was out-of-date */ - OP_JOIN = 1 << 10, - /* Assume the children of the node have been already made */ - OP_MADE = 1 << 11, - /* Special .BEGIN, .END, .INTERRUPT */ - OP_SPECIAL = 1 << 12, - /* Like .USE, only prepend commands */ - OP_USEBEFORE = 1 << 13, - /* The node is invisible to its parents. I.e. it doesn't show up in the - * parents' local variables (.IMPSRC, .ALLSRC). */ - OP_INVISIBLE = 1 << 14, - /* The node is exempt from normal 'main target' processing in parse.c */ - OP_NOTMAIN = 1 << 15, - /* Not a file target; run always */ - OP_PHONY = 1 << 16, - /* Don't search for file in the path */ - OP_NOPATH = 1 << 17, - /* In a dependency line "target: source1 .WAIT source2", source1 is made - * first, including its children. Once that is finished, source2 is made, - * including its children. The .WAIT keyword may appear more than once in - * a single dependency declaration. */ - OP_WAIT = 1 << 18, - /* .NOMETA do not create a .meta file */ - OP_NOMETA = 1 << 19, - /* .META we _do_ want a .meta file */ - OP_META = 1 << 20, - /* Do not compare commands in .meta file */ - OP_NOMETA_CMP = 1 << 21, - /* Possibly a submake node */ - OP_SUBMAKE = 1 << 22, - - /* Attributes applied by PMake */ - - /* The node is a transformation rule, such as ".c.o". */ - OP_TRANSFORM = 1 << 31, - /* Target is a member of an archive */ - /* XXX: How does this differ from OP_ARCHV? */ - OP_MEMBER = 1 << 30, - /* The node is a library, - * its name has the form "-l" */ - OP_LIB = 1 << 29, - /* The node is an archive member, - * its name has the form "archive(member)" */ - /* XXX: How does this differ from OP_MEMBER? */ - OP_ARCHV = 1 << 28, - /* Target has all the commands it should. Used when parsing to catch - * multiple command groups for a target. Only applies to the dependency - * operators ':' and '!', but not to '::'. */ - OP_HAS_COMMANDS = 1 << 27, - /* The special command "..." has been seen. All further commands from - * this node will be saved on the .END node instead, to be executed at - * the very end. */ - OP_SAVE_CMDS = 1 << 26, - /* Already processed by Suff_FindDeps */ - OP_DEPS_FOUND = 1 << 25, - /* Node found while expanding .ALLSRC */ - OP_MARK = 1 << 24, - - OP_NOTARGET = OP_NOTMAIN | OP_USE | OP_EXEC | OP_TRANSFORM + OP_NONE = 0, + + /* The dependency operator ':' is the most common one. The commands + * of this node are executed if any child is out-of-date. */ + OP_DEPENDS = 1 << 0, + /* The dependency operator '!' always executes its commands, even if + * its children are up-to-date. */ + OP_FORCE = 1 << 1, + /* The dependency operator '::' behaves like ':', except that it + * allows multiple dependency groups to be defined. Each of these + * groups is executed on its own, independently from the others. + * Each individual dependency group is called a cohort. */ + OP_DOUBLEDEP = 1 << 2, + + /* Matches the dependency operators ':', '!' and '::'. */ + OP_OPMASK = OP_DEPENDS | OP_FORCE | OP_DOUBLEDEP, + + /* Don't care if the target doesn't exist and can't be created. */ + OP_OPTIONAL = 1 << 3, + /* Use associated commands for parents. */ + OP_USE = 1 << 4, + /* Target is never out of date, but always execute commands anyway. + * Its time doesn't matter, so it has none...sort of. */ + OP_EXEC = 1 << 5, + /* Ignore non-zero exit status from shell commands when creating the + * node. */ + OP_IGNORE = 1 << 6, + /* Don't remove the target when interrupted. */ + OP_PRECIOUS = 1 << 7, + /* Don't echo commands when executed. */ + OP_SILENT = 1 << 8, + /* Target is a recursive make so its commands should always be + * executed when it is out of date, regardless of the state of the + * -n or -t flags. */ + OP_MAKE = 1 << 9, + /* Target is out-of-date only if any of its children was out-of-date. */ + OP_JOIN = 1 << 10, + /* Assume the children of the node have been already made. */ + OP_MADE = 1 << 11, + /* Special .BEGIN, .END or .INTERRUPT. */ + OP_SPECIAL = 1 << 12, + /* Like .USE, only prepend commands. */ + OP_USEBEFORE = 1 << 13, + /* The node is invisible to its parents. I.e. it doesn't show up in + * the parents' local variables (.IMPSRC, .ALLSRC). */ + OP_INVISIBLE = 1 << 14, + /* The node does not become the main target, even if it is the first + * target in the first makefile. */ + OP_NOTMAIN = 1 << 15, + /* Not a file target; run always. */ + OP_PHONY = 1 << 16, + /* Don't search for the file in the path. */ + OP_NOPATH = 1 << 17, + /* In a dependency line "target: source1 .WAIT source2", source1 is + * made first, including its children. Once that is finished, + * source2 is made, including its children. The .WAIT keyword may + * appear more than once in a single dependency declaration. */ + OP_WAIT = 1 << 18, + /* .NOMETA do not create a .meta file */ + OP_NOMETA = 1 << 19, + /* .META we _do_ want a .meta file */ + OP_META = 1 << 20, + /* Do not compare commands in .meta file */ + OP_NOMETA_CMP = 1 << 21, + /* Possibly a submake node */ + OP_SUBMAKE = 1 << 22, + + /* Attributes applied by PMake */ + + /* The node is a transformation rule, such as ".c.o". */ + OP_TRANSFORM = 1 << 30, + /* Target is a member of an archive */ + /* XXX: How does this differ from OP_ARCHV? */ + OP_MEMBER = 1 << 29, + /* The node is a library, + * its name has the form "-l" */ + OP_LIB = 1 << 28, + /* The node is an archive member, + * its name has the form "archive(member)" */ + /* XXX: How does this differ from OP_MEMBER? */ + OP_ARCHV = 1 << 27, + /* Target has all the commands it should. Used when parsing to catch + * multiple command groups for a target. Only applies to the + * dependency operators ':' and '!', but not to '::'. */ + OP_HAS_COMMANDS = 1 << 26, + /* The special command "..." has been seen. All further commands from + * this node will be saved on the .END node instead, to be executed at + * the very end. */ + OP_SAVE_CMDS = 1 << 25, + /* Already processed by Suff_FindDeps, to find dependencies from + * suffix transformation rules. */ + OP_DEPS_FOUND = 1 << 24, + /* Node found while expanding .ALLSRC */ + OP_MARK = 1 << 23, + + OP_NOTARGET = OP_NOTMAIN | OP_USE | OP_EXEC | OP_TRANSFORM } GNodeType; typedef enum GNodeFlags { - REMAKE = 0x0001, /* this target needs to be (re)made */ - CHILDMADE = 0x0002, /* children of this target were made */ - FORCE = 0x0004, /* children don't exist, and we pretend made */ - DONE_WAIT = 0x0008, /* Set by Make_ProcessWait() */ - DONE_ORDER = 0x0010, /* Build requested by .ORDER processing */ - FROM_DEPEND = 0x0020, /* Node created from .depend */ - DONE_ALLSRC = 0x0040, /* We do it once only */ - CYCLE = 0x1000, /* Used by MakePrintStatus */ - DONECYCLE = 0x2000, /* Used by MakePrintStatus */ - INTERNAL = 0x4000 /* Internal use only */ + GNF_NONE = 0, + /* this target needs to be (re)made */ + REMAKE = 0x0001, + /* children of this target were made */ + CHILDMADE = 0x0002, + /* children don't exist, and we pretend made */ + FORCE = 0x0004, + /* Set by Make_ProcessWait() */ + DONE_WAIT = 0x0008, + /* Build requested by .ORDER processing */ + DONE_ORDER = 0x0010, + /* Node created from .depend */ + FROM_DEPEND = 0x0020, + /* We do it once only */ + DONE_ALLSRC = 0x0040, + /* Used by MakePrintStatus */ + CYCLE = 0x1000, + /* Used by MakePrintStatus */ + DONECYCLE = 0x2000, + /* Internal use only */ + INTERNAL = 0x4000 } GNodeFlags; typedef struct List StringList; typedef struct ListNode StringListNode; typedef struct List GNodeList; typedef struct ListNode GNodeListNode; typedef struct List /* of CachedDir */ SearchPath; -/* A graph node represents a target that can possibly be made, including its - * relation to other targets and a lot of other details. */ +/* + * A graph node represents a target that can possibly be made, including its + * relation to other targets and a lot of other details. + */ typedef struct GNode { - /* The target's name, such as "clean" or "make.c" */ - char *name; - /* The unexpanded name of a .USE node */ - char *uname; - /* The full pathname of the file belonging to the target. - * XXX: What about .PHONY targets? These don't have an associated path. */ - char *path; - - /* The type of operator used to define the sources (see the OP flags below). - * XXX: This looks like a wild mixture of type and flags. */ - GNodeType type; - GNodeFlags flags; - - /* The state of processing on this node */ - GNodeMade made; - int unmade; /* The number of unmade children */ - - /* The modification time; 0 means the node does not have a corresponding - * file; see GNode_IsOODate. */ - time_t mtime; - struct GNode *youngestChild; - - /* The GNodes for which this node is an implied source. May be empty. - * For example, when there is an inference rule for .c.o, the node for - * file.c has the node for file.o in this list. */ - GNodeList *implicitParents; - - /* The nodes that depend on this one, or in other words, the nodes for - * which this is a source. */ - GNodeList *parents; - /* The nodes on which this one depends. */ - GNodeList *children; - - /* .ORDER nodes we need made. The nodes that must be made (if they're - * made) before this node can be made, but that do not enter into the - * datedness of this node. */ - GNodeList *order_pred; - /* .ORDER nodes who need us. The nodes that must be made (if they're made - * at all) after this node is made, but that do not depend on this node, - * in the normal sense. */ - GNodeList *order_succ; - - /* Other nodes of the same name, for the '::' dependency operator. */ - GNodeList *cohorts; - /* The "#n" suffix for this cohort, or "" for other nodes */ - char cohort_num[8]; - /* The number of unmade instances on the cohorts list */ - int unmade_cohorts; - /* Pointer to the first instance of a '::' node; only set when on a - * cohorts list */ - struct GNode *centurion; - - /* Last time (sequence number) we tried to make this node */ - unsigned int checked_seqno; - - /* The "local" variables that are specific to this target and this target - * only, such as $@, $<, $?. - * - * Also used for the global variable scopes VAR_GLOBAL, VAR_CMDLINE, - * VAR_INTERNAL, which contain variables with arbitrary names. */ - HashTable /* of Var pointer */ context; - - /* The commands to be given to a shell to create this target. */ - StringList *commands; - - /* Suffix for the node (determined by Suff_FindDeps and opaque to everyone - * but the Suff module) */ - struct Suff *suffix; - - /* Filename where the GNode got defined */ - /* XXX: What is the lifetime of this string? */ - const char *fname; - /* Line number where the GNode got defined */ - int lineno; + /* The target's name, such as "clean" or "make.c" */ + char *name; + /* The unexpanded name of a .USE node */ + char *uname; + /* The full pathname of the file belonging to the target. + * XXX: What about .PHONY targets? These don't have an associated + * path. */ + char *path; + + /* The type of operator used to define the sources (see the OP flags + * below). + * XXX: This looks like a wild mixture of type and flags. */ + GNodeType type; + GNodeFlags flags; + + /* The state of processing on this node */ + GNodeMade made; + /* The number of unmade children */ + int unmade; + + /* The modification time; 0 means the node does not have a + * corresponding file; see GNode_IsOODate. */ + time_t mtime; + struct GNode *youngestChild; + + /* The GNodes for which this node is an implied source. May be empty. + * For example, when there is an inference rule for .c.o, the node for + * file.c has the node for file.o in this list. */ + GNodeList implicitParents; + + /* The nodes that depend on this one, or in other words, the nodes for + * which this is a source. */ + GNodeList parents; + /* The nodes on which this one depends. */ + GNodeList children; + + /* .ORDER nodes we need made. The nodes that must be made (if they're + * made) before this node can be made, but that do not enter into the + * datedness of this node. */ + GNodeList order_pred; + /* .ORDER nodes who need us. The nodes that must be made (if they're + * made at all) after this node is made, but that do not depend on + * this node, in the normal sense. */ + GNodeList order_succ; + + /* Other nodes of the same name, for the '::' dependency operator. */ + GNodeList cohorts; + /* The "#n" suffix for this cohort, or "" for other nodes */ + char cohort_num[8]; + /* The number of unmade instances on the cohorts list */ + int unmade_cohorts; + /* Pointer to the first instance of a '::' node; only set when on a + * cohorts list */ + struct GNode *centurion; + + /* Last time (sequence number) we tried to make this node */ + unsigned int checked_seqno; + + /* The "local" variables that are specific to this target and this + * target only, such as $@, $<, $?. + * + * Also used for the global variable scopes VAR_GLOBAL, VAR_CMDLINE, + * VAR_INTERNAL, which contain variables with arbitrary names. */ + HashTable /* of Var pointer */ vars; + + /* The commands to be given to a shell to create this target. */ + StringList commands; + + /* Suffix for the node (determined by Suff_FindDeps and opaque to + * everyone but the Suff module) */ + struct Suffix *suffix; + + /* Filename where the GNode got defined */ + /* XXX: What is the lifetime of this string? */ + const char *fname; + /* Line number where the GNode got defined */ + int lineno; } GNode; /* Error levels for diagnostics during parsing. */ typedef enum ParseErrorLevel { - /* Exit when the current top-level makefile has been parsed completely. */ - PARSE_FATAL = 1, - /* Print "warning"; may be upgraded to fatal by the -w option. */ - PARSE_WARNING, - /* Informational, mainly used during development of makefiles. */ - PARSE_INFO + /* Exit when the current top-level makefile has been parsed + * completely. */ + PARSE_FATAL = 1, + /* Print "warning"; may be upgraded to fatal by the -w option. */ + PARSE_WARNING, + /* Informational, mainly used during development of makefiles. */ + PARSE_INFO } ParseErrorLevel; /* * Values returned by Cond_EvalLine and Cond_EvalCondition. */ typedef enum CondEvalResult { - COND_PARSE, /* Parse the next lines */ - COND_SKIP, /* Skip the next lines */ - COND_INVALID /* Not a conditional statement */ + COND_PARSE, /* Parse the next lines */ + COND_SKIP, /* Skip the next lines */ + COND_INVALID /* Not a conditional statement */ } CondEvalResult; /* Names of the variables that are "local" to a specific target. */ -#define TARGET "@" /* Target of dependency */ -#define OODATE "?" /* All out-of-date sources */ -#define ALLSRC ">" /* All sources */ -#define IMPSRC "<" /* Source implied by transformation */ -#define PREFIX "*" /* Common prefix */ -#define ARCHIVE "!" /* Archive in "archive(member)" syntax */ -#define MEMBER "%" /* Member in "archive(member)" syntax */ +#define TARGET "@" /* Target of dependency */ +#define OODATE "?" /* All out-of-date sources */ +#define ALLSRC ">" /* All sources */ +#define IMPSRC "<" /* Source implied by transformation */ +#define PREFIX "*" /* Common prefix */ +#define ARCHIVE "!" /* Archive in "archive(member)" syntax */ +#define MEMBER "%" /* Member in "archive(member)" syntax */ /* * Global Variables */ /* True if every target is precious */ extern Boolean allPrecious; /* True if failed targets should be deleted */ extern Boolean deleteOnError; /* TRUE while processing .depend */ extern Boolean doing_depend; /* .DEFAULT rule */ extern GNode *defaultNode; -/* Variables defined internally by make which should not override those set - * by makefiles. */ +/* + * Variables defined internally by make which should not override those set + * by makefiles. + */ extern GNode *VAR_INTERNAL; /* Variables defined in a global context, e.g in the Makefile itself. */ extern GNode *VAR_GLOBAL; /* Variables defined on the command line. */ extern GNode *VAR_CMDLINE; -/* Value returned by Var_Parse when an error is encountered. It actually - * points to an empty string, so naive callers needn't worry about it. */ +/* + * Value returned by Var_Parse when an error is encountered. It actually + * points to an empty string, so naive callers needn't worry about it. + */ extern char var_Error[]; /* The time at the start of this whole process */ extern time_t now; /* - * If FALSE (the default behavior), undefined subexpressions in a variable - * expression are discarded. If TRUE (only during variable assignments using - * the ':=' assignment operator, no matter how deeply nested), they are - * preserved and possibly expanded later when the variable from the - * subexpression has been defined. - * - * Example for a ':=' assignment: - * CFLAGS = $(.INCLUDES) - * CFLAGS := -I.. $(CFLAGS) - * # If .INCLUDES (an undocumented special variable, by the way) is - * # still undefined, the updated CFLAGS becomes "-I.. $(.INCLUDES)". + * The list of directories to search when looking for targets (set by the + * special target .PATH). */ -extern Boolean preserveUndefined; - -/* The list of directories to search when looking for targets (set by the - * special target .PATH). */ -extern SearchPath *dirSearchPath; +extern SearchPath dirSearchPath; /* Used for .include "...". */ extern SearchPath *parseIncPath; -/* Used for .include <...>, for the built-in sys.mk and makefiles from the - * command line arguments. */ +/* + * Used for .include <...>, for the built-in sys.mk and makefiles from the + * command line arguments. + */ extern SearchPath *sysIncPath; /* The default for sysIncPath. */ extern SearchPath *defSysIncPath; /* Startup directory */ extern char curdir[]; /* The basename of the program name, suffixed with [n] for sub-makes. */ -extern char *progname; +extern const char *progname; /* Name of the .depend makefile */ extern char *makeDependfile; /* If we replaced environ, this will be non-NULL. */ extern char **savedEnv; extern int makelevel; /* * We cannot vfork() in a child of vfork(). * Most systems do not enforce this but some do. */ #define vFork() ((getpid() == myPid) ? vfork() : fork()) extern pid_t myPid; -#define MAKEFLAGS ".MAKEFLAGS" -#define MAKEOVERRIDES ".MAKEOVERRIDES" -#define MAKE_JOB_PREFIX ".MAKE.JOB.PREFIX" /* prefix for job target output */ -#define MAKE_EXPORTED ".MAKE.EXPORTED" /* variables we export */ -#define MAKE_MAKEFILES ".MAKE.MAKEFILES" /* all makefiles already loaded */ -#define MAKE_LEVEL ".MAKE.LEVEL" /* recursion level */ +#define MAKEFLAGS ".MAKEFLAGS" +#define MAKEOVERRIDES ".MAKEOVERRIDES" +/* prefix when printing the target of a job */ +#define MAKE_JOB_PREFIX ".MAKE.JOB.PREFIX" +#define MAKE_EXPORTED ".MAKE.EXPORTED" /* exported variables */ +#define MAKE_MAKEFILES ".MAKE.MAKEFILES" /* all loaded makefiles */ +#define MAKE_LEVEL ".MAKE.LEVEL" /* recursion level */ #define MAKE_MAKEFILE_PREFERENCE ".MAKE.MAKEFILE_PREFERENCE" -#define MAKE_DEPENDFILE ".MAKE.DEPENDFILE" /* .depend */ +#define MAKE_DEPENDFILE ".MAKE.DEPENDFILE" /* .depend */ #define MAKE_MODE ".MAKE.MODE" #ifndef MAKE_LEVEL_ENV # define MAKE_LEVEL_ENV "MAKELEVEL" #endif typedef enum DebugFlags { - DEBUG_NONE = 0, - DEBUG_ARCH = 1 << 0, - DEBUG_COND = 1 << 1, - DEBUG_CWD = 1 << 2, - DEBUG_DIR = 1 << 3, - DEBUG_ERROR = 1 << 4, - DEBUG_FOR = 1 << 5, - DEBUG_GRAPH1 = 1 << 6, - DEBUG_GRAPH2 = 1 << 7, - DEBUG_GRAPH3 = 1 << 8, - DEBUG_HASH = 1 << 9, - DEBUG_JOB = 1 << 10, - DEBUG_LOUD = 1 << 11, - DEBUG_MAKE = 1 << 12, - DEBUG_META = 1 << 13, - DEBUG_PARSE = 1 << 14, - DEBUG_SCRIPT = 1 << 15, - DEBUG_SHELL = 1 << 16, - DEBUG_SUFF = 1 << 17, - DEBUG_TARG = 1 << 18, - DEBUG_VAR = 1 << 19, - DEBUG_ALL = (1 << 20) - 1 + DEBUG_NONE = 0, + DEBUG_ARCH = 1 << 0, + DEBUG_COND = 1 << 1, + DEBUG_CWD = 1 << 2, + DEBUG_DIR = 1 << 3, + DEBUG_ERROR = 1 << 4, + DEBUG_FOR = 1 << 5, + DEBUG_GRAPH1 = 1 << 6, + DEBUG_GRAPH2 = 1 << 7, + DEBUG_GRAPH3 = 1 << 8, + DEBUG_HASH = 1 << 9, + DEBUG_JOB = 1 << 10, + DEBUG_LOUD = 1 << 11, + DEBUG_MAKE = 1 << 12, + DEBUG_META = 1 << 13, + DEBUG_PARSE = 1 << 14, + DEBUG_SCRIPT = 1 << 15, + DEBUG_SHELL = 1 << 16, + DEBUG_SUFF = 1 << 17, + DEBUG_TARG = 1 << 18, + DEBUG_VAR = 1 << 19, + DEBUG_ALL = (1 << 20) - 1 } DebugFlags; -#define CONCAT(a,b) a##b +#define CONCAT(a, b) a##b -#define DEBUG(module) (opts.debug & CONCAT(DEBUG_,module)) +#define DEBUG(module) ((opts.debug & CONCAT(DEBUG_, module)) != 0) void debug_printf(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2); -#define DEBUG0(module, text) \ - if (!DEBUG(module)) (void)0; \ - else debug_printf("%s", text) +#define DEBUG_IMPL(module, args) \ + do { \ + if (DEBUG(module)) \ + debug_printf args; \ + } while (/*CONSTCOND*/ 0) +#define DEBUG0(module, text) \ + DEBUG_IMPL(module, ("%s", text)) #define DEBUG1(module, fmt, arg1) \ - if (!DEBUG(module)) (void)0; \ - else debug_printf(fmt, arg1) - + DEBUG_IMPL(module, (fmt, arg1)) #define DEBUG2(module, fmt, arg1, arg2) \ - if (!DEBUG(module)) (void)0; \ - else debug_printf(fmt, arg1, arg2) - + DEBUG_IMPL(module, (fmt, arg1, arg2)) #define DEBUG3(module, fmt, arg1, arg2, arg3) \ - if (!DEBUG(module)) (void)0; \ - else debug_printf(fmt, arg1, arg2, arg3) - + DEBUG_IMPL(module, (fmt, arg1, arg2, arg3)) #define DEBUG4(module, fmt, arg1, arg2, arg3, arg4) \ - if (!DEBUG(module)) (void)0; \ - else debug_printf(fmt, arg1, arg2, arg3, arg4) - + DEBUG_IMPL(module, (fmt, arg1, arg2, arg3, arg4)) #define DEBUG5(module, fmt, arg1, arg2, arg3, arg4, arg5) \ - if (!DEBUG(module)) (void)0; \ - else debug_printf(fmt, arg1, arg2, arg3, arg4, arg5) + DEBUG_IMPL(module, (fmt, arg1, arg2, arg3, arg4, arg5)) typedef enum PrintVarsMode { - PVM_NONE, - PVM_UNEXPANDED, - PVM_EXPANDED + PVM_NONE, + PVM_UNEXPANDED, + PVM_EXPANDED } PrintVarsMode; /* Command line options */ typedef struct CmdOpts { - /* -B: whether we are make compatible */ - Boolean compatMake; + /* -B: whether we are make compatible */ + Boolean compatMake; - /* -d: debug control: There is one bit per module. It is up to the - * module what debug information to print. */ - DebugFlags debug; + /* -d: debug control: There is one bit per module. It is up to the + * module what debug information to print. */ + DebugFlags debug; - /* -df: debug output is written here - default stderr */ - FILE *debug_file; + /* -df: debug output is written here - default stderr */ + FILE *debug_file; - /* -dL: lint mode - * - * Runs make in strict mode, with additional checks and better error - * handling. */ - Boolean lint; + /* -dL: lint mode + * + * Runs make in strict mode, with additional checks and better error + * handling. */ + Boolean strict; - /* -dV: for the -V option, print unexpanded variable values */ - Boolean debugVflag; + /* -dV: for the -V option, print unexpanded variable values */ + Boolean debugVflag; - /* -e: check environment variables before global variables */ - Boolean checkEnvFirst; + /* -e: check environment variables before global variables */ + Boolean checkEnvFirst; - /* -f: the makefiles to read */ - StringList *makefiles; + /* -f: the makefiles to read */ + StringList makefiles; - /* -i: if true, ignore all errors from shell commands */ - Boolean ignoreErrors; + /* -i: if true, ignore all errors from shell commands */ + Boolean ignoreErrors; - /* -j: the maximum number of jobs that can run in parallel; - * this is coordinated with the submakes */ - int maxJobs; + /* -j: the maximum number of jobs that can run in parallel; + * this is coordinated with the submakes */ + int maxJobs; - /* -k: if true, continue on unaffected portions of the graph when an - * error occurs in one portion */ - Boolean keepgoing; + /* -k: if true and an error occurs while making a node, continue + * making nodes that do not depend on the erroneous node */ + Boolean keepgoing; - /* -N: execute no commands from the targets */ - Boolean noRecursiveExecute; + /* -N: execute no commands from the targets */ + Boolean noRecursiveExecute; - /* -n: execute almost no commands from the targets */ - Boolean noExecute; + /* -n: execute almost no commands from the targets */ + Boolean noExecute; - /* -q: if true, we aren't supposed to really make anything, just see if - * the targets are out-of-date */ - Boolean queryFlag; + /* -q: if true, we aren't supposed to really make anything, just see + * if the targets are out-of-date */ + Boolean queryFlag; - /* -r: raw mode, without loading the builtin rules. */ - Boolean noBuiltins; + /* -r: raw mode, without loading the builtin rules. */ + Boolean noBuiltins; - /* -s: don't echo the shell commands before executing them */ - Boolean beSilent; + /* -s: don't echo the shell commands before executing them */ + Boolean beSilent; - /* -t: touch the targets if they are out-of-date, but don't actually - * make them */ - Boolean touchFlag; + /* -t: touch the targets if they are out-of-date, but don't actually + * make them */ + Boolean touchFlag; - /* -[Vv]: print expanded or unexpanded selected variables */ - PrintVarsMode printVars; - /* -[Vv]: the variables to print */ - StringList *variables; + /* -[Vv]: print expanded or unexpanded selected variables */ + PrintVarsMode printVars; + /* -[Vv]: the variables to print */ + StringList variables; - /* -W: if true, makefile parsing warnings are treated as errors */ - Boolean parseWarnFatal; + /* -W: if true, makefile parsing warnings are treated as errors */ + Boolean parseWarnFatal; - /* -w: print Entering and Leaving for submakes */ - Boolean enterFlag; + /* -w: print Entering and Leaving for submakes */ + Boolean enterFlag; - /* -X: if true, do not export variables set on the command line to the - * environment. */ - Boolean varNoExportEnv; + /* -X: if true, do not export variables set on the command line to the + * environment. */ + Boolean varNoExportEnv; - /* The target names specified on the command line. - * Used to resolve .if make(...) statements. */ - StringList *create; + /* The target names specified on the command line. + * Used to resolve .if make(...) statements. */ + StringList create; } CmdOpts; extern CmdOpts opts; #include "nonints.h" void GNode_UpdateYoungestChild(GNode *, GNode *); Boolean GNode_IsOODate(GNode *); void Make_ExpandUse(GNodeList *); time_t Make_Recheck(GNode *); void Make_HandleUse(GNode *, GNode *); void Make_Update(GNode *); void Make_DoAllVar(GNode *); Boolean Make_Run(GNodeList *); Boolean shouldDieQuietly(GNode *, int); void PrintOnError(GNode *, const char *); void Main_ExportMAKEFLAGS(Boolean); Boolean Main_SetObjdir(Boolean, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3); int mkTempFile(const char *, char **); int str2Lst_Append(StringList *, char *); void GNode_FprintDetails(FILE *, const char *, const GNode *, const char *); Boolean GNode_ShouldExecute(GNode *gn); /* See if the node was seen on the left-hand side of a dependency operator. */ MAKE_INLINE Boolean GNode_IsTarget(const GNode *gn) { - return (gn->type & OP_OPMASK) != 0; + return (gn->type & OP_OPMASK) != 0; } MAKE_INLINE const char * GNode_Path(const GNode *gn) { - return gn->path != NULL ? gn->path : gn->name; + return gn->path != NULL ? gn->path : gn->name; +} + +MAKE_INLINE Boolean +GNode_IsWaitingFor(const GNode *gn) +{ + return (gn->flags & REMAKE) && gn->made <= REQUESTED; +} + +MAKE_INLINE Boolean +GNode_IsReady(const GNode *gn) +{ + return gn->made > DEFERRED; +} + +MAKE_INLINE Boolean +GNode_IsDone(const GNode *gn) +{ + return gn->made >= MADE; +} + +MAKE_INLINE Boolean +GNode_IsError(const GNode *gn) +{ + return gn->made == ERROR || gn->made == ABORTED; } MAKE_INLINE const char * GNode_VarTarget(GNode *gn) { return Var_ValueDirect(TARGET, gn); } MAKE_INLINE const char * GNode_VarOodate(GNode *gn) { return Var_ValueDirect(OODATE, gn); } MAKE_INLINE const char * GNode_VarAllsrc(GNode *gn) { return Var_ValueDirect(ALLSRC, gn); } MAKE_INLINE const char * GNode_VarImpsrc(GNode *gn) { return Var_ValueDirect(IMPSRC, gn); } MAKE_INLINE const char * GNode_VarPrefix(GNode *gn) { return Var_ValueDirect(PREFIX, gn); } MAKE_INLINE const char * GNode_VarArchive(GNode *gn) { return Var_ValueDirect(ARCHIVE, gn); } MAKE_INLINE const char * GNode_VarMember(GNode *gn) { return Var_ValueDirect(MEMBER, gn); } #ifdef __GNUC__ #define UNCONST(ptr) ({ \ union __unconst { \ const void *__cp; \ void *__p; \ } __d; \ __d.__cp = ptr, __d.__p; }) #else #define UNCONST(ptr) (void *)(ptr) #endif /* At least GNU/Hurd systems lack hardcoded MAXPATHLEN/PATH_MAX */ #ifdef HAVE_LIMITS_H #include #endif #ifndef MAXPATHLEN #define MAXPATHLEN BMAKE_PATH_MAX #endif #ifndef PATH_MAX #define PATH_MAX MAXPATHLEN #endif #if defined(SYSV) -#define KILLPG(pid, sig) kill(-(pid), (sig)) +#define KILLPG(pid, sig) kill(-(pid), (sig)) #else -#define KILLPG(pid, sig) killpg((pid), (sig)) +#define KILLPG(pid, sig) killpg((pid), (sig)) #endif MAKE_INLINE Boolean ch_isalnum(char ch) { return isalnum((unsigned char)ch) != 0; } MAKE_INLINE Boolean ch_isalpha(char ch) { return isalpha((unsigned char)ch) != 0; } MAKE_INLINE Boolean ch_isdigit(char ch) { return isdigit((unsigned char)ch) != 0; } MAKE_INLINE Boolean ch_isspace(char ch) { return isspace((unsigned char)ch) != 0; } MAKE_INLINE Boolean ch_isupper(char ch) { return isupper((unsigned char)ch) != 0; } MAKE_INLINE char ch_tolower(char ch) { return (char)tolower((unsigned char)ch); } MAKE_INLINE char ch_toupper(char ch) { return (char)toupper((unsigned char)ch); } MAKE_INLINE void cpp_skip_whitespace(const char **pp) { - while (ch_isspace(**pp)) - (*pp)++; + while (ch_isspace(**pp)) + (*pp)++; } MAKE_INLINE void cpp_skip_hspace(const char **pp) { - while (**pp == ' ' || **pp == '\t') - (*pp)++; + while (**pp == ' ' || **pp == '\t') + (*pp)++; } MAKE_INLINE void pp_skip_whitespace(char **pp) { - while (ch_isspace(**pp)) - (*pp)++; + while (ch_isspace(**pp)) + (*pp)++; } MAKE_INLINE void pp_skip_hspace(char **pp) { - while (**pp == ' ' || **pp == '\t') - (*pp)++; + while (**pp == ' ' || **pp == '\t') + (*pp)++; } -#ifdef MAKE_NATIVE +#if defined(lint) +# define MAKE_RCSID(id) extern void do_not_define_rcsid(void) +#elif defined(MAKE_NATIVE) # include -# ifndef lint -# define MAKE_RCSID(id) __RCSID(id) -# endif +# define MAKE_RCSID(id) __RCSID(id) +#elif defined(MAKE_ALL_IN_ONE) && defined(__COUNTER__) +# define MAKE_RCSID_CONCAT(x, y) CONCAT(x, y) +# define MAKE_RCSID(id) static volatile char \ + MAKE_RCSID_CONCAT(rcsid_, __COUNTER__)[] = id +#elif defined(MAKE_ALL_IN_ONE) +# define MAKE_RCSID(id) extern void do_not_define_rcsid(void) #else # define MAKE_RCSID(id) static volatile char rcsid[] = id #endif #endif /* MAKE_MAKE_H */ diff --git a/make_malloc.c b/make_malloc.c index 9a8570b6a2b0..62cbb0a5cc07 100644 --- a/make_malloc.c +++ b/make_malloc.c @@ -1,94 +1,93 @@ -/* $NetBSD: make_malloc.c,v 1.23 2020/10/05 19:27:47 rillig Exp $ */ +/* $NetBSD: make_malloc.c,v 1.24 2020/12/07 22:37:18 rillig Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include #include "make.h" -MAKE_RCSID("$NetBSD: make_malloc.c,v 1.23 2020/10/05 19:27:47 rillig Exp $"); +MAKE_RCSID("$NetBSD: make_malloc.c,v 1.24 2020/12/07 22:37:18 rillig Exp $"); #ifndef USE_EMALLOC /* die when out of memory. */ static MAKE_ATTR_DEAD void enomem(void) { (void)fprintf(stderr, "%s: %s.\n", progname, strerror(ENOMEM)); exit(2); } /* malloc, but die on error. */ void * bmake_malloc(size_t len) { void *p; if ((p = malloc(len)) == NULL) enomem(); return p; } /* strdup, but die on error. */ char * bmake_strdup(const char *str) { size_t len; char *p; len = strlen(str) + 1; - if ((p = malloc(len)) == NULL) - enomem(); + p = bmake_malloc(len); return memcpy(p, str, len); } /* Allocate a string starting from str with exactly len characters. */ char * bmake_strldup(const char *str, size_t len) { char *p = bmake_malloc(len + 1); memcpy(p, str, len); p[len] = '\0'; return p; } /* realloc, but die on error. */ void * bmake_realloc(void *ptr, size_t size) { if ((ptr = realloc(ptr, size)) == NULL) enomem(); return ptr; } #endif /* Allocate a string from start up to but excluding end. */ char * bmake_strsedup(const char *start, const char *end) { return bmake_strldup(start, (size_t)(end - start)); } diff --git a/make_malloc.h b/make_malloc.h index 551495fb6266..4dacc924c40f 100644 --- a/make_malloc.h +++ b/make_malloc.h @@ -1,54 +1,56 @@ -/* $NetBSD: make_malloc.h,v 1.13 2020/11/10 00:32:12 rillig Exp $ */ +/* $NetBSD: make_malloc.h,v 1.15 2020/12/30 10:03:16 rillig Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifndef USE_EMALLOC void *bmake_malloc(size_t); void *bmake_realloc(void *, size_t); char *bmake_strdup(const char *); char *bmake_strldup(const char *, size_t); #else #include #define bmake_malloc(n) emalloc(n) #define bmake_realloc(p, n) erealloc(p, n) #define bmake_strdup(s) estrdup(s) #define bmake_strldup(s, n) estrndup(s, n) #endif char *bmake_strsedup(const char *, const char *); -/* Thin wrapper around free(3) to avoid the extra function call in case +/* + * Thin wrapper around free(3) to avoid the extra function call in case * p is NULL, to save a few machine instructions. * * The case of a NULL pointer happens especially often after Var_Value, - * since only environment variables need to be freed, but not others. */ + * since only environment variables need to be freed, but not others. + */ MAKE_INLINE void bmake_free(void *p) { - if (p != NULL) - free(p); + if (p != NULL) + free(p); } diff --git a/meta.c b/meta.c index e77fa3d73a7b..feff26846e4d 100644 --- a/meta.c +++ b/meta.c @@ -1,1711 +1,1710 @@ -/* $NetBSD: meta.c,v 1.144 2020/11/15 12:02:44 rillig Exp $ */ +/* $NetBSD: meta.c,v 1.168 2021/01/10 21:20:46 rillig Exp $ */ /* * Implement 'meta' mode. * Adapted from John Birrell's patches to FreeBSD make. * --sjg */ /* * Copyright (c) 2009-2016, Juniper Networks, Inc. * Portions Copyright (c) 2009, John Birrell. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #if defined(USE_META) #ifdef HAVE_CONFIG_H # include "config.h" #endif #include #ifdef HAVE_LIBGEN_H #include #elif !defined(HAVE_DIRNAME) char * dirname(char *); #endif #include #if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H) #include #endif #include "make.h" #include "dir.h" #include "job.h" #ifdef USE_FILEMON #include "filemon/filemon.h" #endif static BuildMon Mybm; /* for compat */ -static StringList *metaBailiwick; /* our scope of control */ +static StringList metaBailiwick = LST_INIT; /* our scope of control */ static char *metaBailiwickStr; /* string storage for the list */ -static StringList *metaIgnorePaths; /* paths we deliberately ignore */ +static StringList metaIgnorePaths = LST_INIT; /* paths we deliberately ignore */ static char *metaIgnorePathsStr; /* string storage for the list */ #ifndef MAKE_META_IGNORE_PATHS #define MAKE_META_IGNORE_PATHS ".MAKE.META.IGNORE_PATHS" #endif #ifndef MAKE_META_IGNORE_PATTERNS #define MAKE_META_IGNORE_PATTERNS ".MAKE.META.IGNORE_PATTERNS" #endif #ifndef MAKE_META_IGNORE_FILTER #define MAKE_META_IGNORE_FILTER ".MAKE.META.IGNORE_FILTER" #endif Boolean useMeta = FALSE; static Boolean useFilemon = FALSE; static Boolean writeMeta = FALSE; static Boolean metaMissing = FALSE; /* oodate if missing */ static Boolean filemonMissing = FALSE; /* oodate if missing */ static Boolean metaEnv = FALSE; /* don't save env unless asked */ static Boolean metaVerbose = FALSE; static Boolean metaIgnoreCMDs = FALSE; /* ignore CMDs in .meta files */ static Boolean metaIgnorePatterns = FALSE; /* do we need to do pattern matches */ -static Boolean metaIgnoreFilter = FALSE; /* do we have more complex filtering? */ +static Boolean metaIgnoreFilter = FALSE; /* do we have more complex filtering? */ static Boolean metaCurdirOk = FALSE; /* write .meta in .CURDIR Ok? */ static Boolean metaSilent = FALSE; /* if we have a .meta be SILENT */ extern Boolean forceJobs; extern char **environ; -#define MAKE_META_PREFIX ".MAKE.META.PREFIX" +#define MAKE_META_PREFIX ".MAKE.META.PREFIX" #ifndef N2U # define N2U(n, u) (((n) + ((u) - 1)) / (u)) #endif #ifndef ROUNDUP # define ROUNDUP(n, u) (N2U((n), (u)) * (u)) #endif #if !defined(HAVE_STRSEP) # define strsep(s, d) stresep((s), (d), '\0') #endif /* * Filemon is a kernel module which snoops certain syscalls. * * C chdir * E exec * F [v]fork * L [sym]link * M rename * R read * W write * S stat * * See meta_oodate below - we mainly care about 'E' and 'R'. * * We can still use meta mode without filemon, but * the benefits are more limited. */ #ifdef USE_FILEMON /* * Open the filemon device. */ static void meta_open_filemon(BuildMon *pbm) { int dupfd; pbm->mon_fd = -1; pbm->filemon = NULL; - if (!useFilemon || !pbm->mfp) + if (!useFilemon || pbm->mfp == NULL) return; pbm->filemon = filemon_open(); if (pbm->filemon == NULL) { useFilemon = FALSE; warn("Could not open filemon %s", filemon_path()); return; } /* * We use a file outside of '.' * to avoid a FreeBSD kernel bug where unlink invalidates * cwd causing getcwd to do a lot more work. * We only care about the descriptor. */ pbm->mon_fd = mkTempFile("filemon.XXXXXX", NULL); if ((dupfd = dup(pbm->mon_fd)) == -1) { err(1, "Could not dup filemon output!"); } (void)fcntl(dupfd, F_SETFD, FD_CLOEXEC); if (filemon_setfd(pbm->filemon, dupfd) == -1) { err(1, "Could not set filemon file descriptor!"); } /* we don't need these once we exec */ (void)fcntl(pbm->mon_fd, F_SETFD, FD_CLOEXEC); } /* * Read the build monitor output file and write records to the target's * metadata file. */ static int filemon_read(FILE *mfp, int fd) { char buf[BUFSIZ]; int error; /* Check if we're not writing to a meta data file.*/ if (mfp == NULL) { if (fd >= 0) close(fd); /* not interested */ return 0; } /* rewind */ if (lseek(fd, (off_t)0, SEEK_SET) < 0) { error = errno; warn("Could not rewind filemon"); fprintf(mfp, "\n"); } else { ssize_t n; error = 0; fprintf(mfp, "\n-- filemon acquired metadata --\n"); while ((n = read(fd, buf, sizeof buf)) > 0) { if ((ssize_t)fwrite(buf, 1, (size_t)n, mfp) < n) error = EIO; } } fflush(mfp); if (close(fd) < 0) error = errno; return error; } #endif /* * when realpath() fails, * we use this, to clean up ./ and ../ */ static void eat_dots(char *buf, size_t bufsz, int dots) { char *cp; char *cp2; const char *eat; size_t eatlen; switch (dots) { case 1: eat = "/./"; eatlen = 2; break; case 2: eat = "/../"; eatlen = 3; break; default: return; } do { cp = strstr(buf, eat); - if (cp) { + if (cp != NULL) { cp2 = cp + eatlen; if (dots == 2 && cp > buf) { do { cp--; } while (cp > buf && *cp != '/'); } if (*cp == '/') { strlcpy(cp, cp2, bufsz - (size_t)(cp - buf)); } else { return; /* can't happen? */ } } - } while (cp); + } while (cp != NULL); } static char * meta_name(char *mname, size_t mnamelen, const char *dname, const char *tname, const char *cwd) { char buf[MAXPATHLEN]; char *rp; char *cp; char *tp; char *dtp; size_t ldname; /* * Weed out relative paths from the target file name. * We have to be careful though since if target is a * symlink, the result will be unstable. * So we use realpath() just to get the dirname, and leave the * basename as given to us. */ - if ((cp = strrchr(tname, '/'))) { - if (cached_realpath(tname, buf)) { - if ((rp = strrchr(buf, '/'))) { + if ((cp = strrchr(tname, '/')) != NULL) { + if (cached_realpath(tname, buf) != NULL) { + if ((rp = strrchr(buf, '/')) != NULL) { rp++; cp++; if (strcmp(cp, rp) != 0) strlcpy(rp, cp, sizeof buf - (size_t)(rp - buf)); } tname = buf; } else { /* * We likely have a directory which is about to be made. * We pretend realpath() succeeded, to have a chance * of generating the same meta file name that we will * next time through. */ if (tname[0] == '/') { strlcpy(buf, tname, sizeof buf); } else { snprintf(buf, sizeof buf, "%s/%s", cwd, tname); } eat_dots(buf, sizeof buf, 1); /* ./ */ eat_dots(buf, sizeof buf, 2); /* ../ */ tname = buf; } } /* on some systems dirname may modify its arg */ tp = bmake_strdup(tname); dtp = dirname(tp); if (strcmp(dname, dtp) == 0) snprintf(mname, mnamelen, "%s.meta", tname); else { ldname = strlen(dname); if (strncmp(dname, dtp, ldname) == 0 && dtp[ldname] == '/') snprintf(mname, mnamelen, "%s/%s.meta", dname, &tname[ldname+1]); else snprintf(mname, mnamelen, "%s/%s.meta", dname, tname); /* * Replace path separators in the file name after the * current object directory path. */ cp = mname + strlen(dname) + 1; while (*cp != '\0') { if (*cp == '/') *cp = '_'; cp++; } } free(tp); return mname; } /* * Return true if running ${.MAKE} * Bypassed if target is flagged .MAKE */ -static int -is_submake(void *cmdp, void *gnp) +static Boolean +is_submake(const char *cmd, GNode *gn) { static const char *p_make = NULL; static size_t p_len; - char *cmd = cmdp; - GNode *gn = gnp; char *mp = NULL; char *cp; char *cp2; - int rc = 0; /* keep looking */ + Boolean rc = FALSE; if (p_make == NULL) { - void *dontFreeIt; - p_make = Var_Value(".MAKE", gn, &dontFreeIt); + p_make = Var_Value(".MAKE", gn).str; p_len = strlen(p_make); } cp = strchr(cmd, '$'); - if ((cp)) { + if (cp != NULL) { (void)Var_Subst(cmd, gn, VARE_WANTRES, &mp); /* TODO: handle errors */ cmd = mp; } cp2 = strstr(cmd, p_make); if (cp2 != NULL) { switch (cp2[p_len]) { case '\0': case ' ': case '\t': case '\n': - rc = 1; + rc = TRUE; break; } - if (cp2 > cmd && rc > 0) { + if (cp2 > cmd && rc) { switch (cp2[-1]) { case ' ': case '\t': case '\n': break; default: - rc = 0; /* no match */ + rc = FALSE; /* no match */ break; } } } free(mp); return rc; } -typedef struct meta_file_s { - FILE *fp; - GNode *gn; -} meta_file_t; +static Boolean +any_is_submake(GNode *gn) +{ + StringListNode *ln; + + for (ln = gn->commands.first; ln != NULL; ln = ln->next) + if (is_submake(ln->datum, gn)) + return TRUE; + return FALSE; +} static void -printCMD(const char *cmd, meta_file_t *mfp) +printCMD(const char *cmd, FILE *fp, GNode *gn) { char *cmd_freeIt = NULL; - if (strchr(cmd, '$')) { - (void)Var_Subst(cmd, mfp->gn, VARE_WANTRES, &cmd_freeIt); + if (strchr(cmd, '$') != NULL) { + (void)Var_Subst(cmd, gn, VARE_WANTRES, &cmd_freeIt); /* TODO: handle errors */ cmd = cmd_freeIt; } - fprintf(mfp->fp, "CMD %s\n", cmd); + fprintf(fp, "CMD %s\n", cmd); free(cmd_freeIt); } static void -printCMDs(GNode *gn, meta_file_t *mf) +printCMDs(GNode *gn, FILE *fp) { - GNodeListNode *ln; + StringListNode *ln; - for (ln = gn->commands->first; ln != NULL; ln = ln->next) - printCMD(ln->datum, mf); + for (ln = gn->commands.first; ln != NULL; ln = ln->next) + printCMD(ln->datum, fp, gn); } /* * Certain node types never get a .meta file */ #define SKIP_META_TYPE(_type) do { \ if ((gn->type & __CONCAT(OP_, _type))) { \ if (verbose) { \ debug_printf("Skipping meta for %s: .%s\n", \ gn->name, __STRING(_type)); \ } \ return FALSE; \ } \ -} while (0) +} while (/*CONSTCOND*/0) /* * Do we need/want a .meta file ? */ static Boolean meta_needed(GNode *gn, const char *dname, - char *objdir, int verbose) + char *objdir_realpath, Boolean verbose) { struct cached_stat cst; if (verbose) verbose = DEBUG(META); /* This may be a phony node which we don't want meta data for... */ /* Skip .meta for .BEGIN, .END, .ERROR etc as well. */ /* Or it may be explicitly flagged as .NOMETA */ SKIP_META_TYPE(NOMETA); /* Unless it is explicitly flagged as .META */ if (!(gn->type & OP_META)) { SKIP_META_TYPE(PHONY); SKIP_META_TYPE(SPECIAL); SKIP_META_TYPE(MAKE); } /* Check if there are no commands to execute. */ - if (Lst_IsEmpty(gn->commands)) { + if (Lst_IsEmpty(&gn->commands)) { if (verbose) debug_printf("Skipping meta for %s: no commands\n", gn->name); return FALSE; } if ((gn->type & (OP_META|OP_SUBMAKE)) == OP_SUBMAKE) { /* OP_SUBMAKE is a bit too aggressive */ - if (Lst_ForEachUntil(gn->commands, is_submake, gn)) { + if (any_is_submake(gn)) { DEBUG1(META, "Skipping meta for %s: .SUBMAKE\n", gn->name); return FALSE; } } /* The object directory may not exist. Check it.. */ if (cached_stat(dname, &cst) != 0) { if (verbose) debug_printf("Skipping meta for %s: no .OBJDIR\n", gn->name); return FALSE; } /* make sure these are canonical */ - if (cached_realpath(dname, objdir)) - dname = objdir; + if (cached_realpath(dname, objdir_realpath) != NULL) + dname = objdir_realpath; /* If we aren't in the object directory, don't create a meta file. */ if (!metaCurdirOk && strcmp(curdir, dname) == 0) { if (verbose) debug_printf("Skipping meta for %s: .OBJDIR == .CURDIR\n", gn->name); return FALSE; } return TRUE; } static FILE * meta_create(BuildMon *pbm, GNode *gn) { - meta_file_t mf; + FILE *fp; char buf[MAXPATHLEN]; - char objdir[MAXPATHLEN]; + char objdir_realpath[MAXPATHLEN]; char **ptr; - const char *dname; + FStr dname; const char *tname; char *fname; const char *cp; - void *objdir_freeIt; - mf.fp = NULL; + fp = NULL; - dname = Var_Value(".OBJDIR", gn, &objdir_freeIt); + dname = Var_Value(".OBJDIR", gn); tname = GNode_VarTarget(gn); - /* if this succeeds objdir is realpath of dname */ - if (!meta_needed(gn, dname, objdir, TRUE)) + /* if this succeeds objdir_realpath is realpath of dname */ + if (!meta_needed(gn, dname.str, objdir_realpath, TRUE)) goto out; - dname = objdir; + dname.str = objdir_realpath; if (metaVerbose) { char *mp; /* Describe the target we are building */ (void)Var_Subst("${" MAKE_META_PREFIX "}", gn, VARE_WANTRES, &mp); /* TODO: handle errors */ - if (*mp) + if (mp[0] != '\0') fprintf(stdout, "%s\n", mp); free(mp); } /* Get the basename of the target */ - if ((cp = strrchr(tname, '/')) == NULL) { - cp = tname; - } else { - cp++; - } + cp = str_basename(tname); fflush(stdout); if (!writeMeta) /* Don't create meta data. */ goto out; fname = meta_name(pbm->meta_fname, sizeof pbm->meta_fname, - dname, tname, objdir); + dname.str, tname, objdir_realpath); #ifdef DEBUG_META_MODE DEBUG1(META, "meta_create: %s\n", fname); #endif - if ((mf.fp = fopen(fname, "w")) == NULL) + if ((fp = fopen(fname, "w")) == NULL) err(1, "Could not open meta file '%s'", fname); - fprintf(mf.fp, "# Meta data file %s\n", fname); + fprintf(fp, "# Meta data file %s\n", fname); - mf.gn = gn; + printCMDs(gn, fp); - printCMDs(gn, &mf); - - fprintf(mf.fp, "CWD %s\n", getcwd(buf, sizeof buf)); - fprintf(mf.fp, "TARGET %s\n", tname); + fprintf(fp, "CWD %s\n", getcwd(buf, sizeof buf)); + fprintf(fp, "TARGET %s\n", tname); cp = GNode_VarOodate(gn); - if (cp && *cp) { - fprintf(mf.fp, "OODATE %s\n", cp); + if (cp != NULL && *cp != '\0') { + fprintf(fp, "OODATE %s\n", cp); } if (metaEnv) { for (ptr = environ; *ptr != NULL; ptr++) - fprintf(mf.fp, "ENV %s\n", *ptr); + fprintf(fp, "ENV %s\n", *ptr); } - fprintf(mf.fp, "-- command output --\n"); - fflush(mf.fp); + fprintf(fp, "-- command output --\n"); + fflush(fp); Var_Append(".MAKE.META.FILES", fname, VAR_GLOBAL); Var_Append(".MAKE.META.CREATED", fname, VAR_GLOBAL); gn->type |= OP_META; /* in case anyone wants to know */ if (metaSilent) { gn->type |= OP_SILENT; } out: - bmake_free(objdir_freeIt); + FStr_Done(&dname); - return mf.fp; + return fp; } static Boolean boolValue(char *s) { switch(*s) { case '0': case 'N': case 'n': case 'F': case 'f': return FALSE; } return TRUE; } /* * Initialization we need before reading makefiles. */ void meta_init(void) { #ifdef USE_FILEMON /* this allows makefiles to test if we have filemon support */ Var_Set(".MAKE.PATH_FILEMON", filemon_path(), VAR_GLOBAL); #endif } #define get_mode_bf(bf, token) \ - if ((cp = strstr(make_mode, token))) \ + if ((cp = strstr(make_mode, token)) != NULL) \ bf = boolValue(cp + sizeof (token) - 1) /* * Initialization we need after reading makefiles. */ void meta_mode_init(const char *make_mode) { - static int once = 0; + static Boolean once = FALSE; char *cp; - void *freeIt; + FStr value; useMeta = TRUE; useFilemon = TRUE; writeMeta = TRUE; - if (make_mode) { - if (strstr(make_mode, "env")) + if (make_mode != NULL) { + if (strstr(make_mode, "env") != NULL) metaEnv = TRUE; - if (strstr(make_mode, "verb")) + if (strstr(make_mode, "verb") != NULL) metaVerbose = TRUE; - if (strstr(make_mode, "read")) + if (strstr(make_mode, "read") != NULL) writeMeta = FALSE; - if (strstr(make_mode, "nofilemon")) + if (strstr(make_mode, "nofilemon") != NULL) useFilemon = FALSE; - if (strstr(make_mode, "ignore-cmd")) + if (strstr(make_mode, "ignore-cmd") != NULL) metaIgnoreCMDs = TRUE; if (useFilemon) get_mode_bf(filemonMissing, "missing-filemon="); get_mode_bf(metaCurdirOk, "curdirok="); get_mode_bf(metaMissing, "missing-meta="); get_mode_bf(metaSilent, "silent="); } if (metaVerbose && !Var_Exists(MAKE_META_PREFIX, VAR_GLOBAL)) { /* * The default value for MAKE_META_PREFIX * prints the absolute path of the target. * This works be cause :H will generate '.' if there is no / * and :tA will resolve that to cwd. */ Var_Set(MAKE_META_PREFIX, "Building ${.TARGET:H:tA}/${.TARGET:T}", VAR_GLOBAL); } if (once) return; - once = 1; + once = TRUE; memset(&Mybm, 0, sizeof Mybm); /* * We consider ourselves master of all within ${.MAKE.META.BAILIWICK} */ - metaBailiwick = Lst_New(); (void)Var_Subst("${.MAKE.META.BAILIWICK:O:u:tA}", VAR_GLOBAL, VARE_WANTRES, &metaBailiwickStr); /* TODO: handle errors */ - str2Lst_Append(metaBailiwick, metaBailiwickStr); + str2Lst_Append(&metaBailiwick, metaBailiwickStr); /* * We ignore any paths that start with ${.MAKE.META.IGNORE_PATHS} */ - metaIgnorePaths = Lst_New(); Var_Append(MAKE_META_IGNORE_PATHS, "/dev /etc /proc /tmp /var/run /var/tmp ${TMPDIR}", VAR_GLOBAL); (void)Var_Subst("${" MAKE_META_IGNORE_PATHS ":O:u:tA}", VAR_GLOBAL, VARE_WANTRES, &metaIgnorePathsStr); /* TODO: handle errors */ - str2Lst_Append(metaIgnorePaths, metaIgnorePathsStr); + str2Lst_Append(&metaIgnorePaths, metaIgnorePathsStr); /* * We ignore any paths that match ${.MAKE.META.IGNORE_PATTERNS} */ - freeIt = NULL; - if (Var_Value(MAKE_META_IGNORE_PATTERNS, VAR_GLOBAL, &freeIt)) { + value = Var_Value(MAKE_META_IGNORE_PATTERNS, VAR_GLOBAL); + if (value.str != NULL) { metaIgnorePatterns = TRUE; - bmake_free(freeIt); + FStr_Done(&value); } - freeIt = NULL; - if (Var_Value(MAKE_META_IGNORE_FILTER, VAR_GLOBAL, &freeIt)) { + value = Var_Value(MAKE_META_IGNORE_FILTER, VAR_GLOBAL); + if (value.str != NULL) { metaIgnoreFilter = TRUE; - bmake_free(freeIt); + FStr_Done(&value); } } /* * In each case below we allow for job==NULL */ void meta_job_start(Job *job, GNode *gn) { BuildMon *pbm; if (job != NULL) { pbm = &job->bm; } else { pbm = &Mybm; } pbm->mfp = meta_create(pbm, gn); #ifdef USE_FILEMON_ONCE /* compat mode we open the filemon dev once per command */ if (job == NULL) return; #endif #ifdef USE_FILEMON if (pbm->mfp != NULL && useFilemon) { meta_open_filemon(pbm); } else { pbm->mon_fd = -1; pbm->filemon = NULL; } #endif } /* * The child calls this before doing anything. * It does not disturb our state. */ void meta_job_child(Job *job) { #ifdef USE_FILEMON BuildMon *pbm; if (job != NULL) { pbm = &job->bm; } else { pbm = &Mybm; } if (pbm->mfp != NULL) { close(fileno(pbm->mfp)); - if (useFilemon && pbm->filemon) { + if (useFilemon && pbm->filemon != NULL) { pid_t pid; pid = getpid(); if (filemon_setpid_child(pbm->filemon, pid) == -1) { err(1, "Could not set filemon pid!"); } } } #endif } void meta_job_parent(Job *job, pid_t pid) { #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) BuildMon *pbm; if (job != NULL) { pbm = &job->bm; } else { pbm = &Mybm; } - if (useFilemon && pbm->filemon) { + if (useFilemon && pbm->filemon != NULL) { filemon_setpid_parent(pbm->filemon, pid); } #endif } int meta_job_fd(Job *job) { #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) BuildMon *pbm; if (job != NULL) { pbm = &job->bm; } else { pbm = &Mybm; } - if (useFilemon && pbm->filemon) { + if (useFilemon && pbm->filemon != NULL) { return filemon_readfd(pbm->filemon); } #endif return -1; } int meta_job_event(Job *job) { #if defined(USE_FILEMON) && !defined(USE_FILEMON_DEV) BuildMon *pbm; if (job != NULL) { pbm = &job->bm; } else { pbm = &Mybm; } - if (useFilemon && pbm->filemon) { + if (useFilemon && pbm->filemon != NULL) { return filemon_process(pbm->filemon); } #endif return 0; } void -meta_job_error(Job *job, GNode *gn, int flags, int status) +meta_job_error(Job *job, GNode *gn, Boolean ignerr, int status) { char cwd[MAXPATHLEN]; BuildMon *pbm; if (job != NULL) { pbm = &job->bm; if (gn == NULL) gn = job->node; } else { pbm = &Mybm; } if (pbm->mfp != NULL) { fprintf(pbm->mfp, "\n*** Error code %d%s\n", - status, - (flags & JOB_IGNERR) ? - "(ignored)" : ""); + status, ignerr ? "(ignored)" : ""); } - if (gn) { + if (gn != NULL) { Var_Set(".ERROR_TARGET", GNode_Path(gn), VAR_GLOBAL); } getcwd(cwd, sizeof cwd); Var_Set(".ERROR_CWD", cwd, VAR_GLOBAL); if (pbm->meta_fname[0] != '\0') { Var_Set(".ERROR_META_FILE", pbm->meta_fname, VAR_GLOBAL); } meta_job_finish(job); } void meta_job_output(Job *job, char *cp, const char *nl) { BuildMon *pbm; if (job != NULL) { pbm = &job->bm; } else { pbm = &Mybm; } if (pbm->mfp != NULL) { if (metaVerbose) { static char *meta_prefix = NULL; static size_t meta_prefix_len; if (meta_prefix == NULL) { char *cp2; (void)Var_Subst("${" MAKE_META_PREFIX "}", VAR_GLOBAL, VARE_WANTRES, &meta_prefix); /* TODO: handle errors */ - if ((cp2 = strchr(meta_prefix, '$'))) + if ((cp2 = strchr(meta_prefix, '$')) != NULL) meta_prefix_len = (size_t)(cp2 - meta_prefix); else meta_prefix_len = strlen(meta_prefix); } if (strncmp(cp, meta_prefix, meta_prefix_len) == 0) { - cp = strchr(cp+1, '\n'); - if (!cp++) + cp = strchr(cp + 1, '\n'); + if (cp == NULL) return; + cp++; } } fprintf(pbm->mfp, "%s%s", cp, nl); } } int meta_cmd_finish(void *pbmp) { int error = 0; BuildMon *pbm = pbmp; #ifdef USE_FILEMON int x; #endif if (pbm == NULL) pbm = &Mybm; #ifdef USE_FILEMON - if (pbm->filemon) { + if (pbm->filemon != NULL) { while (filemon_process(pbm->filemon) > 0) continue; if (filemon_close(pbm->filemon) == -1) error = errno; x = filemon_read(pbm->mfp, pbm->mon_fd); if (error == 0 && x != 0) error = x; pbm->mon_fd = -1; pbm->filemon = NULL; return error; } #endif fprintf(pbm->mfp, "\n"); /* ensure end with newline */ return error; } int meta_job_finish(Job *job) { BuildMon *pbm; int error = 0; int x; if (job != NULL) { pbm = &job->bm; } else { pbm = &Mybm; } if (pbm->mfp != NULL) { error = meta_cmd_finish(pbm); x = fclose(pbm->mfp); if (error == 0 && x != 0) error = errno; pbm->mfp = NULL; pbm->meta_fname[0] = '\0'; } return error; } void meta_finish(void) { - if (metaBailiwick != NULL) - Lst_Free(metaBailiwick); + Lst_Done(&metaBailiwick); free(metaBailiwickStr); - if (metaIgnorePaths != NULL) - Lst_Free(metaIgnorePaths); + Lst_Done(&metaIgnorePaths); free(metaIgnorePathsStr); } /* * Fetch a full line from fp - growing bufp if needed * Return length in bufp. */ static int fgetLine(char **bufp, size_t *szp, int o, FILE *fp) { char *buf = *bufp; size_t bufsz = *szp; struct stat fs; int x; if (fgets(&buf[o], (int)bufsz - o, fp) != NULL) { check_newline: x = o + (int)strlen(&buf[o]); if (buf[x - 1] == '\n') return x; /* * We need to grow the buffer. * The meta file can give us a clue. */ if (fstat(fileno(fp), &fs) == 0) { size_t newsz; char *p; newsz = ROUNDUP(((size_t)fs.st_size / 2), BUFSIZ); if (newsz <= bufsz) newsz = ROUNDUP((size_t)fs.st_size, BUFSIZ); if (newsz <= bufsz) return x; /* truncated */ - DEBUG2(META, "growing buffer %zu -> %zu\n", bufsz, newsz); + DEBUG2(META, "growing buffer %u -> %u\n", + (unsigned)bufsz, (unsigned)newsz); p = bmake_realloc(buf, newsz); - if (p) { - *bufp = buf = p; - *szp = bufsz = newsz; - /* fetch the rest */ - if (fgets(&buf[x], (int)bufsz - x, fp) == NULL) - return x; /* truncated! */ - goto check_newline; - } + *bufp = buf = p; + *szp = bufsz = newsz; + /* fetch the rest */ + if (fgets(&buf[x], (int)bufsz - x, fp) == NULL) + return x; /* truncated! */ + goto check_newline; } } return 0; } -/* Lst_ForEachUntil wants 1 to stop search */ -static int -prefix_match(void *p, void *q) +static Boolean +prefix_match(const char *prefix, const char *path) { - const char *prefix = p; - const char *path = q; size_t n = strlen(prefix); return strncmp(path, prefix, n) == 0; } +static Boolean +has_any_prefix(const char *path, StringList *prefixes) +{ + StringListNode *ln; + + for (ln = prefixes->first; ln != NULL; ln = ln->next) + if (prefix_match(ln->datum, path)) + return TRUE; + return FALSE; +} + /* See if the path equals prefix or starts with "prefix/". */ static Boolean path_starts_with(const char *path, const char *prefix) { size_t n = strlen(prefix); if (strncmp(path, prefix, n) != 0) return FALSE; return path[n] == '\0' || path[n] == '/'; } -static int +static Boolean meta_ignore(GNode *gn, const char *p) { char fname[MAXPATHLEN]; if (p == NULL) return TRUE; if (*p == '/') { cached_realpath(p, fname); /* clean it up */ - if (Lst_ForEachUntil(metaIgnorePaths, prefix_match, fname)) { + if (has_any_prefix(fname, &metaIgnorePaths)) { #ifdef DEBUG_META_MODE DEBUG1(META, "meta_oodate: ignoring path: %s\n", p); #endif return TRUE; } } if (metaIgnorePatterns) { const char *expr; char *pm; Var_Set(".p.", p, gn); expr = "${" MAKE_META_IGNORE_PATTERNS ":@m@${.p.:M$m}@}"; (void)Var_Subst(expr, gn, VARE_WANTRES, &pm); /* TODO: handle errors */ - if (*pm) { + if (pm[0] != '\0') { #ifdef DEBUG_META_MODE DEBUG1(META, "meta_oodate: ignoring pattern: %s\n", p); #endif free(pm); return TRUE; } free(pm); } if (metaIgnoreFilter) { char *fm; /* skip if filter result is empty */ snprintf(fname, sizeof fname, "${%s:L:${%s:ts:}}", p, MAKE_META_IGNORE_FILTER); (void)Var_Subst(fname, gn, VARE_WANTRES, &fm); /* TODO: handle errors */ if (*fm == '\0') { #ifdef DEBUG_META_MODE DEBUG1(META, "meta_oodate: ignoring filtered: %s\n", p); #endif free(fm); return TRUE; } free(fm); } return FALSE; } /* * When running with 'meta' functionality, a target can be out-of-date * if any of the references in its meta data file is more recent. * We have to track the latestdir on a per-process basis. */ #define LCWD_VNAME_FMT ".meta.%d.lcwd" #define LDIR_VNAME_FMT ".meta.%d.ldir" /* * It is possible that a .meta file is corrupted, * if we detect this we want to reproduce it. * Setting oodate TRUE will have that effect. */ -#define CHECK_VALID_META(p) if (!(p && *p)) { \ +#define CHECK_VALID_META(p) if (!(p != NULL && *p != '\0')) { \ warnx("%s: %d: malformed", fname, lineno); \ oodate = TRUE; \ continue; \ } #define DEQUOTE(p) if (*p == '\'') { \ char *ep; \ p++; \ - if ((ep = strchr(p, '\''))) \ + if ((ep = strchr(p, '\'')) != NULL) \ *ep = '\0'; \ } static void append_if_new(StringList *list, const char *str) { StringListNode *ln; for (ln = list->first; ln != NULL; ln = ln->next) if (strcmp(ln->datum, str) == 0) return; Lst_Append(list, bmake_strdup(str)); } Boolean meta_oodate(GNode *gn, Boolean oodate) { static char *tmpdir = NULL; static char cwd[MAXPATHLEN]; char lcwd_vname[64]; char ldir_vname[64]; char lcwd[MAXPATHLEN]; char latestdir[MAXPATHLEN]; char fname[MAXPATHLEN]; char fname1[MAXPATHLEN]; char fname2[MAXPATHLEN]; char fname3[MAXPATHLEN]; - const char *dname; + FStr dname; const char *tname; char *p; - char *cp; char *link_src; char *move_target; static size_t cwdlen = 0; static size_t tmplen = 0; FILE *fp; Boolean needOODATE = FALSE; - StringList *missingFiles; + StringList missingFiles; Boolean have_filemon = FALSE; - void *objdir_freeIt; if (oodate) return oodate; /* we're done */ - dname = Var_Value(".OBJDIR", gn, &objdir_freeIt); + dname = Var_Value(".OBJDIR", gn); tname = GNode_VarTarget(gn); /* if this succeeds fname3 is realpath of dname */ - if (!meta_needed(gn, dname, fname3, FALSE)) + if (!meta_needed(gn, dname.str, fname3, FALSE)) goto oodate_out; - dname = fname3; + dname.str = fname3; - missingFiles = Lst_New(); + Lst_Init(&missingFiles); /* * We need to check if the target is out-of-date. This includes * checking if the expanded command has changed. This in turn * requires that all variables are set in the same way that they * would be if the target needs to be re-built. */ Make_DoAllVar(gn); - meta_name(fname, sizeof fname, dname, tname, dname); + meta_name(fname, sizeof fname, dname.str, tname, dname.str); #ifdef DEBUG_META_MODE DEBUG1(META, "meta_oodate: %s\n", fname); #endif if ((fp = fopen(fname, "r")) != NULL) { static char *buf = NULL; static size_t bufsz; int lineno = 0; int lastpid = 0; int pid; int x; StringListNode *cmdNode; struct cached_stat cst; if (buf == NULL) { bufsz = 8 * BUFSIZ; buf = bmake_malloc(bufsz); } if (cwdlen == 0) { if (getcwd(cwd, sizeof cwd) == NULL) err(1, "Could not get current working directory"); cwdlen = strlen(cwd); } strlcpy(lcwd, cwd, sizeof lcwd); strlcpy(latestdir, cwd, sizeof latestdir); if (tmpdir == NULL) { tmpdir = getTmpdir(); tmplen = strlen(tmpdir); } /* we want to track all the .meta we read */ Var_Append(".MAKE.META.FILES", fname, VAR_GLOBAL); - cmdNode = gn->commands->first; + cmdNode = gn->commands.first; while (!oodate && (x = fgetLine(&buf, &bufsz, 0, fp)) > 0) { lineno++; if (buf[x - 1] == '\n') buf[x - 1] = '\0'; else { warnx("%s: %d: line truncated at %u", fname, lineno, x); oodate = TRUE; break; } link_src = NULL; move_target = NULL; /* Find the start of the build monitor section. */ if (!have_filemon) { if (strncmp(buf, "-- filemon", 10) == 0) { have_filemon = TRUE; continue; } if (strncmp(buf, "# buildmon", 10) == 0) { have_filemon = TRUE; continue; } } /* Delimit the record type. */ p = buf; #ifdef DEBUG_META_MODE DEBUG3(META, "%s: %d: %s\n", fname, lineno, buf); #endif strsep(&p, " "); if (have_filemon) { /* * We are in the 'filemon' output section. * Each record from filemon follows the general form: * * * * Where: * is a single letter, denoting the syscall. * is the process that made the syscall. * is the arguments (of interest). */ switch(buf[0]) { case '#': /* comment */ case 'V': /* version */ break; default: /* * We need to track pathnames per-process. * * Each process run by make, starts off in the 'CWD' * recorded in the .meta file, if it chdirs ('C') * elsewhere we need to track that - but only for * that process. If it forks ('F'), we initialize * the child to have the same cwd as its parent. * * We also need to track the 'latestdir' of * interest. This is usually the same as cwd, but * not if a process is reading directories. * * Each time we spot a different process ('pid') * we save the current value of 'latestdir' in a * variable qualified by 'lastpid', and * re-initialize 'latestdir' to any pre-saved * value for the current 'pid' and 'CWD' if none. */ CHECK_VALID_META(p); pid = atoi(p); if (pid > 0 && pid != lastpid) { - const char *ldir; - void *tp; + FStr ldir; if (lastpid > 0) { /* We need to remember these. */ Var_Set(lcwd_vname, lcwd, VAR_GLOBAL); Var_Set(ldir_vname, latestdir, VAR_GLOBAL); } snprintf(lcwd_vname, sizeof lcwd_vname, LCWD_VNAME_FMT, pid); snprintf(ldir_vname, sizeof ldir_vname, LDIR_VNAME_FMT, pid); lastpid = pid; - ldir = Var_Value(ldir_vname, VAR_GLOBAL, &tp); - if (ldir) { - strlcpy(latestdir, ldir, sizeof latestdir); - bmake_free(tp); + ldir = Var_Value(ldir_vname, VAR_GLOBAL); + if (ldir.str != NULL) { + strlcpy(latestdir, ldir.str, sizeof latestdir); + FStr_Done(&ldir); } - ldir = Var_Value(lcwd_vname, VAR_GLOBAL, &tp); - if (ldir) { - strlcpy(lcwd, ldir, sizeof lcwd); - bmake_free(tp); + ldir = Var_Value(lcwd_vname, VAR_GLOBAL); + if (ldir.str != NULL) { + strlcpy(lcwd, ldir.str, sizeof lcwd); + FStr_Done(&ldir); } } /* Skip past the pid. */ if (strsep(&p, " ") == NULL) continue; #ifdef DEBUG_META_MODE if (DEBUG(META)) debug_printf("%s: %d: %d: %c: cwd=%s lcwd=%s ldir=%s\n", fname, lineno, pid, buf[0], cwd, lcwd, latestdir); #endif break; } CHECK_VALID_META(p); /* Process according to record type. */ switch (buf[0]) { case 'X': /* eXit */ Var_Delete(lcwd_vname, VAR_GLOBAL); Var_Delete(ldir_vname, VAR_GLOBAL); lastpid = 0; /* no need to save ldir_vname */ break; case 'F': /* [v]Fork */ { char cldir[64]; int child; child = atoi(p); if (child > 0) { snprintf(cldir, sizeof cldir, LCWD_VNAME_FMT, child); Var_Set(cldir, lcwd, VAR_GLOBAL); snprintf(cldir, sizeof cldir, LDIR_VNAME_FMT, child); Var_Set(cldir, latestdir, VAR_GLOBAL); #ifdef DEBUG_META_MODE if (DEBUG(META)) debug_printf( "%s: %d: %d: cwd=%s lcwd=%s ldir=%s\n", fname, lineno, child, cwd, lcwd, latestdir); #endif } } break; case 'C': /* Chdir */ /* Update lcwd and latest directory. */ strlcpy(latestdir, p, sizeof latestdir); strlcpy(lcwd, p, sizeof lcwd); Var_Set(lcwd_vname, lcwd, VAR_GLOBAL); Var_Set(ldir_vname, lcwd, VAR_GLOBAL); #ifdef DEBUG_META_MODE DEBUG4(META, "%s: %d: cwd=%s ldir=%s\n", fname, lineno, cwd, lcwd); #endif break; case 'M': /* renaMe */ /* * For 'M'oves we want to check * the src as for 'R'ead * and the target as for 'W'rite. */ - cp = p; /* save this for a second */ - /* now get target */ - if (strsep(&p, " ") == NULL) - continue; - CHECK_VALID_META(p); - move_target = p; - p = cp; + { + char *cp = p; /* save this for a second */ + /* now get target */ + if (strsep(&p, " ") == NULL) + continue; + CHECK_VALID_META(p); + move_target = p; + p = cp; + } /* 'L' and 'M' put single quotes around the args */ DEQUOTE(p); DEQUOTE(move_target); /* FALLTHROUGH */ case 'D': /* unlink */ if (*p == '/') { /* remove any missingFiles entries that match p */ - StringListNode *ln = missingFiles->first; + StringListNode *ln = missingFiles.first; while (ln != NULL) { StringListNode *next = ln->next; if (path_starts_with(ln->datum, p)) { free(ln->datum); - Lst_Remove(missingFiles, ln); + Lst_Remove(&missingFiles, ln); } ln = next; } } if (buf[0] == 'M') { /* the target of the mv is a file 'W'ritten */ #ifdef DEBUG_META_MODE DEBUG2(META, "meta_oodate: M %s -> %s\n", p, move_target); #endif p = move_target; goto check_write; } break; case 'L': /* Link */ /* * For 'L'inks check * the src as for 'R'ead * and the target as for 'W'rite. */ link_src = p; /* now get target */ if (strsep(&p, " ") == NULL) continue; CHECK_VALID_META(p); /* 'L' and 'M' put single quotes around the args */ DEQUOTE(p); DEQUOTE(link_src); #ifdef DEBUG_META_MODE DEBUG2(META, "meta_oodate: L %s -> %s\n", link_src, p); #endif /* FALLTHROUGH */ case 'W': /* Write */ check_write: /* * If a file we generated within our bailiwick * but outside of .OBJDIR is missing, * we need to do it again. */ /* ignore non-absolute paths */ if (*p != '/') break; - if (Lst_IsEmpty(metaBailiwick)) + if (Lst_IsEmpty(&metaBailiwick)) break; /* ignore cwd - normal dependencies handle those */ if (strncmp(p, cwd, cwdlen) == 0) break; - if (!Lst_ForEachUntil(metaBailiwick, prefix_match, p)) + if (!has_any_prefix(p, &metaBailiwick)) break; /* tmpdir might be within */ if (tmplen > 0 && strncmp(p, tmpdir, tmplen) == 0) break; /* ignore anything containing the string "tmp" */ /* XXX: The arguments to strstr must be swapped. */ - if ((strstr("tmp", p))) + if (strstr("tmp", p) != NULL) break; if ((link_src != NULL && cached_lstat(p, &cst) < 0) || (link_src == NULL && cached_stat(p, &cst) < 0)) { if (!meta_ignore(gn, p)) - append_if_new(missingFiles, p); + append_if_new(&missingFiles, p); } break; check_link_src: p = link_src; link_src = NULL; #ifdef DEBUG_META_MODE DEBUG1(META, "meta_oodate: L src %s\n", p); #endif /* FALLTHROUGH */ case 'R': /* Read */ case 'E': /* Exec */ /* * Check for runtime files that can't * be part of the dependencies because * they are _expected_ to change. */ if (meta_ignore(gn, p)) break; /* * The rest of the record is the file name. * Check if it's not an absolute path. */ { char *sdirs[4]; char **sdp; int sdx = 0; - int found = 0; + Boolean found = FALSE; if (*p == '/') { sdirs[sdx++] = p; /* done */ } else { if (strcmp(".", p) == 0) - continue; /* no point */ + continue; /* no point */ /* Check vs latestdir */ snprintf(fname1, sizeof fname1, "%s/%s", latestdir, p); sdirs[sdx++] = fname1; if (strcmp(latestdir, lcwd) != 0) { /* Check vs lcwd */ snprintf(fname2, sizeof fname2, "%s/%s", lcwd, p); sdirs[sdx++] = fname2; } if (strcmp(lcwd, cwd) != 0) { /* Check vs cwd */ snprintf(fname3, sizeof fname3, "%s/%s", cwd, p); sdirs[sdx++] = fname3; } } sdirs[sdx++] = NULL; - for (sdp = sdirs; *sdp && !found; sdp++) { + for (sdp = sdirs; *sdp != NULL && !found; sdp++) { #ifdef DEBUG_META_MODE DEBUG3(META, "%s: %d: looking for: %s\n", fname, lineno, *sdp); #endif if (cached_stat(*sdp, &cst) == 0) { - found = 1; + found = TRUE; p = *sdp; } } if (found) { #ifdef DEBUG_META_MODE DEBUG3(META, "%s: %d: found: %s\n", fname, lineno, p); #endif if (!S_ISDIR(cst.cst_mode) && cst.cst_mtime > gn->mtime) { DEBUG3(META, "%s: %d: file '%s' is newer than the target...\n", fname, lineno, p); oodate = TRUE; } else if (S_ISDIR(cst.cst_mode)) { /* Update the latest directory. */ cached_realpath(p, latestdir); } } else if (errno == ENOENT && *p == '/' && strncmp(p, cwd, cwdlen) != 0) { /* * A referenced file outside of CWD is missing. * We cannot catch every eventuality here... */ - append_if_new(missingFiles, p); + append_if_new(&missingFiles, p); } } if (buf[0] == 'E') { /* previous latestdir is no longer relevant */ strlcpy(latestdir, lcwd, sizeof latestdir); } break; default: break; } if (!oodate && buf[0] == 'L' && link_src != NULL) goto check_link_src; } else if (strcmp(buf, "CMD") == 0) { /* * Compare the current command with the one in the * meta data file. */ if (cmdNode == NULL) { DEBUG2(META, "%s: %d: there were more build commands in the meta data file than there are now...\n", fname, lineno); oodate = TRUE; } else { + const char *cp; char *cmd = cmdNode->datum; Boolean hasOODATE = FALSE; - if (strstr(cmd, "$?")) + if (strstr(cmd, "$?") != NULL) hasOODATE = TRUE; - else if ((cp = strstr(cmd, ".OODATE"))) { + else if ((cp = strstr(cmd, ".OODATE")) != NULL) { /* check for $[{(].OODATE[:)}] */ if (cp > cmd + 2 && cp[-2] == '$') hasOODATE = TRUE; } if (hasOODATE) { needOODATE = TRUE; DEBUG2(META, "%s: %d: cannot compare command using .OODATE\n", fname, lineno); } (void)Var_Subst(cmd, gn, VARE_WANTRES|VARE_UNDEFERR, &cmd); /* TODO: handle errors */ - if ((cp = strchr(cmd, '\n'))) { + if ((cp = strchr(cmd, '\n')) != NULL) { int n; /* * This command contains newlines, we need to * fetch more from the .meta file before we * attempt a comparison. */ /* first put the newline back at buf[x - 1] */ buf[x - 1] = '\n'; do { /* now fetch the next line */ if ((n = fgetLine(&buf, &bufsz, x, fp)) <= 0) break; x = n; lineno++; if (buf[x - 1] != '\n') { warnx("%s: %d: line truncated at %u", fname, lineno, x); break; } - cp = strchr(++cp, '\n'); - } while (cp); + cp = strchr(cp + 1, '\n'); + } while (cp != NULL); if (buf[x - 1] == '\n') buf[x - 1] = '\0'; } if (p != NULL && !hasOODATE && !(gn->type & OP_NOMETA_CMP) && (strcmp(p, cmd) != 0)) { DEBUG4(META, "%s: %d: a build command has changed\n%s\nvs\n%s\n", fname, lineno, p, cmd); if (!metaIgnoreCMDs) oodate = TRUE; } free(cmd); cmdNode = cmdNode->next; } } else if (strcmp(buf, "CWD") == 0) { /* * Check if there are extra commands now * that weren't in the meta data file. */ if (!oodate && cmdNode != NULL) { DEBUG2(META, "%s: %d: there are extra build commands now that weren't in the meta data file\n", fname, lineno); oodate = TRUE; } CHECK_VALID_META(p); if (strcmp(p, cwd) != 0) { DEBUG4(META, "%s: %d: the current working directory has changed from '%s' to '%s'\n", fname, lineno, p, curdir); oodate = TRUE; } } } fclose(fp); - if (!Lst_IsEmpty(missingFiles)) { + if (!Lst_IsEmpty(&missingFiles)) { DEBUG2(META, "%s: missing files: %s...\n", - fname, (char *)missingFiles->first->datum); + fname, (char *)missingFiles.first->datum); oodate = TRUE; } if (!oodate && !have_filemon && filemonMissing) { DEBUG1(META, "%s: missing filemon data\n", fname); oodate = TRUE; } } else { if (writeMeta && (metaMissing || (gn->type & OP_META))) { - cp = NULL; + const char *cp = NULL; /* if target is in .CURDIR we do not need a meta file */ - if (gn->path && (cp = strrchr(gn->path, '/')) && cp > gn->path) { + if (gn->path != NULL && (cp = strrchr(gn->path, '/')) != NULL && + (cp > gn->path)) { if (strncmp(curdir, gn->path, (size_t)(cp - gn->path)) != 0) { cp = NULL; /* not in .CURDIR */ } } if (cp == NULL) { DEBUG1(META, "%s: required but missing\n", fname); oodate = TRUE; needOODATE = TRUE; /* assume the worst */ } } } - Lst_Destroy(missingFiles, free); + Lst_DoneCall(&missingFiles, free); if (oodate && needOODATE) { /* * Target uses .OODATE which is empty; or we wouldn't be here. * We have decided it is oodate, so .OODATE needs to be set. * All we can sanely do is set it to .ALLSRC. */ Var_Delete(OODATE, gn); Var_Set(OODATE, GNode_VarAllsrc(gn), gn); } oodate_out: - bmake_free(objdir_freeIt); + FStr_Done(&dname); return oodate; } /* support for compat mode */ static int childPipe[2]; void meta_compat_start(void) { #ifdef USE_FILEMON_ONCE /* * We need to re-open filemon for each cmd. */ BuildMon *pbm = &Mybm; if (pbm->mfp != NULL && useFilemon) { meta_open_filemon(pbm); } else { pbm->mon_fd = -1; pbm->filemon = NULL; } #endif if (pipe(childPipe) < 0) Punt("Cannot create pipe: %s", strerror(errno)); /* Set close-on-exec flag for both */ (void)fcntl(childPipe[0], F_SETFD, FD_CLOEXEC); (void)fcntl(childPipe[1], F_SETFD, FD_CLOEXEC); } void meta_compat_child(void) { meta_job_child(NULL); if (dup2(childPipe[1], 1) < 0 || dup2(1, 2) < 0) execDie("dup2", "pipe"); } void meta_compat_parent(pid_t child) { int outfd, metafd, maxfd, nfds; char buf[BUFSIZ+1]; fd_set readfds; meta_job_parent(NULL, child); close(childPipe[1]); /* child side */ outfd = childPipe[0]; #ifdef USE_FILEMON - metafd = Mybm.filemon ? filemon_readfd(Mybm.filemon) : -1; + metafd = Mybm.filemon != NULL ? filemon_readfd(Mybm.filemon) : -1; #else metafd = -1; #endif maxfd = -1; if (outfd > maxfd) maxfd = outfd; if (metafd > maxfd) maxfd = metafd; while (outfd != -1 || metafd != -1) { FD_ZERO(&readfds); if (outfd != -1) { FD_SET(outfd, &readfds); } if (metafd != -1) { FD_SET(metafd, &readfds); } nfds = select(maxfd + 1, &readfds, NULL, NULL, NULL); if (nfds == -1) { if (errno == EINTR) continue; err(1, "select"); } - if (outfd != -1 && FD_ISSET(outfd, &readfds)) do { + if (outfd != -1 && FD_ISSET(outfd, &readfds) != 0) do { /* XXX this is not line-buffered */ ssize_t nread = read(outfd, buf, sizeof buf - 1); if (nread == -1) err(1, "read"); if (nread == 0) { close(outfd); outfd = -1; break; } fwrite(buf, 1, (size_t)nread, stdout); fflush(stdout); buf[nread] = '\0'; meta_job_output(NULL, buf, ""); - } while (0); - if (metafd != -1 && FD_ISSET(metafd, &readfds)) { + } while (/*CONSTCOND*/0); + if (metafd != -1 && FD_ISSET(metafd, &readfds) != 0) { if (meta_job_event(NULL) <= 0) metafd = -1; } } } -#endif /* USE_META */ +#endif /* USE_META */ diff --git a/meta.h b/meta.h index a4feb9e2d324..1fc8910d3b65 100644 --- a/meta.h +++ b/meta.h @@ -1,60 +1,60 @@ -/* $NetBSD: meta.h,v 1.8 2020/10/19 23:43:55 rillig Exp $ */ +/* $NetBSD: meta.h,v 1.9 2020/12/10 20:49:11 rillig Exp $ */ /* * Things needed for 'meta' mode. */ /* * Copyright (c) 2009-2010, Juniper Networks, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the copyright holders nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ typedef struct BuildMon { char meta_fname[MAXPATHLEN]; struct filemon *filemon; int mon_fd; FILE *mfp; } BuildMon; struct Job; void meta_init(void); void meta_finish(void); void meta_mode_init(const char *); void meta_job_start(struct Job *, GNode *); void meta_job_child(struct Job *); void meta_job_parent(struct Job *, pid_t); int meta_job_fd(struct Job *); int meta_job_event(struct Job *); -void meta_job_error(struct Job *, GNode *, int, int); +void meta_job_error(struct Job *, GNode *, Boolean, int); void meta_job_output(struct Job *, char *, const char *); int meta_cmd_finish(void *); int meta_job_finish(struct Job *); Boolean meta_oodate(GNode *, Boolean); void meta_compat_start(void); void meta_compat_child(void); void meta_compat_parent(pid_t); extern Boolean useMeta; diff --git a/metachar.h b/metachar.h index ced0648fa19e..3c0780a31b8b 100644 --- a/metachar.h +++ b/metachar.h @@ -1,48 +1,48 @@ -/* $NetBSD: metachar.h,v 1.12 2020/11/10 00:32:12 rillig Exp $ */ +/* $NetBSD: metachar.h,v 1.13 2021/01/10 21:20:46 rillig Exp $ */ /*- * Copyright (c) 2015 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Christos Zoulas. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #ifndef MAKE_METACHAR_H #define MAKE_METACHAR_H #include "make.h" extern unsigned char _metachar[]; -#define is_shell_metachar(c) _metachar[(c) & 0x7f] +#define is_shell_metachar(c) (_metachar[(c) & 0x7f] != 0) MAKE_INLINE int needshell(const char *cmd) { while (!is_shell_metachar(*cmd) && *cmd != ':' && *cmd != '=') cmd++; return *cmd != '\0'; } #endif /* MAKE_METACHAR_H */ diff --git a/mk/ChangeLog b/mk/ChangeLog index 80abde7ea93f..4c74e668faf1 100644 --- a/mk/ChangeLog +++ b/mk/ChangeLog @@ -1,1716 +1,1755 @@ +2021-01-06 Simon J Gerraty + + * install-mk (MK_VERSION): 20210101 + + * dirdeps.mk: first time we are read, just use TARGET_SPEC for + _DEP_TARGET_SPEC + +2020-12-22 Simon J Gerraty + + * sys.mk (MAKE_SHELL): use ${.SHELL:Ush} + and use := when setting SHELL + +2020-12-21 Simon J Gerraty + + * install-mk (MK_VERSION): 20201221 + + * dirdeps-options.mk: latest bmake allows only one arg to .undef + +2020-12-11 Simon J Gerraty + + * dirdeps-targets.mk: allow for "." in DIRDEPS_TARGETS_DIRS + so that any directory can be treated as a target. + +2020-11-26 Simon J Gerraty + + * install-mk (MK_VERSION): 20201126 + + * own.mk: use .MAKE.{UID,GID} if available. + + * init.mk: suppress _SKIP_BUILD warning if doing -V + +2020-11-20 Simon J Gerraty + + * install-mk (MK_VERSION): 20201120 + + * init.mk: rename LEVEL0_TARGETS to DIRDEPS_BUILD_LEVEL0_TARGETS + + * dirdeps-targets.mk: fix typo in comment + 2020-11-06 Simon J Gerraty * install-mk (MK_VERSION): 20201106 * meta.autodep.mk: use OBJ_EXTENSIONS rather than hardcode sed args to tweak extensions for local deps. 2020-11-01 Simon J Gerraty * install-mk (MK_VERSION): 20201101 * dirdeps.mk: most leaf makefiles are not suitable for building dirdeps.cache so if RELDIR is not "." use dirdeps.mk 2020-10-28 Simon J Gerraty * install-mk (MK_VERSION): 20201028 * dirdeps.mk: if we don't have :range use equivalent of M_RANGE when building dirdeps.cache for leaf directory use -f dirdeps.mk * sys.vars.mk: add M_JOT and M_RANGE 2020-10-01 Simon J Gerraty * install-mk (MK_VERSION): 20201001 * meta2deps.{py,sh}: throw an error if we don't see filemon version 2020-09-09 Simon J Gerraty * install-mk (MK_VERSION): 20200909 * dirdeps-cache-update.mk: use cache_update_dirdep as guard target 2020-08-26 Simon J Gerraty * dirdeps.mk: ensure we cannot confuse a static cache for dynamic (even more rare that use of static cache is playing clever tricks with it) 2020-08-16 Simon J Gerraty * dirdeps-cache-update.mk: allow MK_STATIC_DIRDEPS_CACHE_UPDATE_IMMEDIATE to control when we actually update STATIC_DIRDEPS_CACHE. * stage-install.sh: create dest directory if needed before running install(1) 2020-08-10 Simon J Gerraty * dirdeps-targets.mk: include Makefile.dirdeps.options * dirdeps.mk: use _TARGETS if defined for DIRDEPS_CACHE 2020-08-09 Simon J Gerraty * dirdeps.mk: default BUILD_DIRDEPS_MAKEFILE to empty * dirdeps-cache-update.mk: building parallel cache update under the context of dirdeps-cached would be ideal, but is problematic, so it runs as a sibling. Use cache-built target to ensure we wait for it to complete if necessary. 2020-08-06 Simon J Gerraty * install-mk (MK_VERSION): 20200806 * dirdeps-options: allow TARGET_SPEC to affect option values. Use DIRDEPS_OPTIONS_QUALIFIER_LIST before using bare MK_* * dirdeps-targets.mk: check for MK_STATIC_DIRDEPS_CACHE defined before looking for STATIC_DIRDEPS_CACHE 2020-08-05 Simon J Gerraty * host-target.mk: Darwin use MACHINE for HOST_ARCH too * dirdeps-options.mk: improve debug output 2020-07-22 Simon J Gerraty * dirdeps.mk: set and export DYNAMIC_DIRDEPS_CACHE for use by dirdeps-cache-update.mk * dirdeps-targets.mk: set and export STATIC_DIRDEPS_CACHE for use by dirdeps-cache-update.mk even if we don't use it. * dirdeps-cache-update.mk: we only need worry about the background update case, with the above, the update from DIRDEPS_CACHE is simple. * meta2deps.py: R 1234 . is not interesting 2020-07-20 Simon J Gerraty * sys.mk: default MK_STATIC_DIRDEPS_CACHE from MK_DIRDEPS_CACHE * dirdeps-options.mk: do not :tu DIRDEPS_OPTIONS allows use of lower case for pseudo options. * dirdeps-cache-update.mk: magic to deal with STATIC_DIRDEPS_CACHE 2020-07-18 Simon J Gerraty * dirdeps-targets.mk: Look for Makefile.dirdeps.cache which allows us to have a static cache for expensive targets. Use -DWITHOUT_STATIC_DIRDEPS_CACHE -DWITH_DIRDEPS_CACHE to regenerate the dirdeps.cache it is a copy of. 2020-07-17 Simon J Gerraty * Get rid of BUILD_AT_LEVEL0, MK_DIRDEPS_BUILD makes more sense. 2020-07-16 Simon J Gerraty * dirdeps.mk (DIRDEP_LOADAVG_REPORT): make it easy to record load averages at intervals during build. 2020-07-15 Simon J Gerraty * install-mk (MK_VERSION): 20200715 * dirdeps.mk: tweak Checking line to make matching Finished lines for post-build analysis easier. * meta.autodep.mk: use !defined(WITHOUT_META_STATS) * progs.mk: avoid prog.mk outputting multiple Finished lines 2020-07-11 Simon J Gerraty * dirdeps.mk: further optimize dirdeps.cache generate a DIRDEPS.${.TARGET} list for other purposes and improve the layout. 2020-07-10 Simon J Gerraty * dirdeps.mk: optimize content of dirdeps.cache 2020-06-28 Simon J Gerraty * sys/*.mk: make it easier for local*sys.mk to customize by using ?= 2020-06-22 Simon J Gerraty * gendirdeps.mk (LOCAL_DEPENDS_GUARD): if we don't build at level 0 it is much safer to guard local depends with a simple check for .MAKE.LEVEL > 0 2020-06-10 Simon J Gerraty * install-mk (MK_VERSION): 20200610 * mkopt.sh: this needs posix shell so #!/bin/sh should be ok 2020-06-06 Simon J Gerraty * install-mk (MK_VERSION): 20200606 * dirdeps-targets.mk: allow for filtering of .TARGETS * meta2deps.py: fix bug in processing 'L'ink and 'M'ove entries - and we don't care about 'W'rite entries. Also ignore absolute paths that do not exist. 2020-05-25 Simon J Gerraty * install-mk (MK_VERSION): 20200525 * init.mk: expand and simplify handling of qualified vars like CPPFLAGS.${.TARGET:T} 2020-05-15 Simon J Gerraty * install-mk (MK_VERSION): 20200515 * dirdeps.mk: set _debug_* earlier and allow passing -d* flags to submake when building DIRDEPS_CACHE 2020-05-09 Simon J Gerraty * whats.mk: more easily extensible 2020-05-02 Simon J Gerraty * whats.mk: greatly simplify by adding what.c to SRCS 2020-05-01 Simon J Gerraty * whats.mk: for libs take care how we add to *OBJS * lib.mk: : works better with whats.mk 2020-04-25 Simon J Gerraty * install-mk (MK_VERSION): 20200420 * meta.stage.mk: it is not a STAGE_CONFLICT if some-target.dirdep contains the same ${RELDIR} and a prefix match for our ${TARGET_SPEC} 2020-04-16 Simon J Gerraty * install-mk (MK_VERSION): 20200416 * sys/*.mk: set MAKE_SHELL rather than SHELL so as not to interfere with user env. * sys.mk: default MAKE_SHELL to sh and SHELL to MAKE_SHELL * autodep.mk: use MAKE_SHELL. 2019-11-21 Simon J Gerraty * gendirdeps.mk: clear .SUFFIXES to avoid a lot of wasted effort, and unexport _meta_files when no longer needed as it consumes space we need for command line. 2019-11-11 Simon J Gerraty * dirdeps.mk _DIRDEP_USE: use DIRDEP_DIR and add DIRDEP_USE_PRELUDE at start - facilitates job distribution 2019-10-04 Simon J Gerraty * dirdeps-targets.mk: Use TARGET_SPEC_LAST_LIST defaults to ${${TARGET_SPEC_VARS:[-1]}_LIST} to match valid TARGET_SPEC qualified depend files. 2019-10-02 Simon J Gerraty * dirdeps-targets.mk: encapsulate logic for finding top-level targets to set initial DIRDEPS for DIRDEPS_BUILD 2019-09-27 Simon J Gerraty * install-mk (MK_VERSION): 20190911 * compiler.mk: set COMPILER_TYPE 2019-07-17 Simon J Gerraty * install-mk (MK_VERSION): 20190704 * sys/Darwin.mk: support for Objective-C and clang 2019-05-30 Simon J Gerraty * dirdeps.mk: avoid insanely long command line when generating cache 2019-05-23 Simon J Gerraty * install-mk (MK_VERSION): 20190505 * whats.mk: handle corner case SHLIB defined but not LIB 2018-09-19 Simon J Gerraty * install-mk (MK_VERSION): 20180919 * dirdeps-options.mk: .undef cannot handle var that expands to more than one var. 2018-07-08 Simon J Gerraty * meta.stage.mk: allow wildcards in STAGE_FILES.* etc. 2018-06-01 Simon J Gerraty * meta.autodep.mk: export META_FILES to avoid command line limit * gendirdeps.mk: if we have lots of .meta files put them in an @list 2018-05-28 Simon J Gerraty * dirdeps-options.mk: use local.dirdeps-options.mk not local.dirdeps-option.mk 2018-04-20 Simon J Gerraty * install-mk (MK_VERSION): 20180420 * dirdeps.mk: include local.dirdeps-build.mk when .MAKE.LEVEL > 0 ie. we are building something. 2018-04-14 Simon J Gerraty * FILES: add dirdeps-options.mk to deal with optional DIRDEPS. 2018-04-05 Simon J Gerraty * install-mk (MK_VERSION): 20180405 * ldorder.mk: describe how to use LDORDER_EXTERN_BARRIER if needed. 2018-01-18 Simon J Gerraty * install-mk (MK_VERSION): 20180118 * ldorder.mk: let make compute correct link order 2017-12-12 Simon J Gerraty * install-mk (MK_VERSION): 20171212 * gendirdeps.mk: guard against bogus entries in GENDIRDEPS_FILTER 2017-11-14 Simon J. Gerraty * install-mk (MK_VERSION): 20171111 * lib.mk: ensure META_NOECHO is set 2017-10-25 Simon J. Gerraty * Allow for host32 on rare occasions. 2017-10-18 Simon J. Gerraty * install-mk (MK_VERSION): 20171018 * whats.mk: include what_thing in what_uuid to avoid problem when building multiple apps in the same directory. 2017-08-12 Simon J. Gerraty * install-mk (MK_VERSION): 20170812 * autoconf.mk: Use CONFIGURE_DEPS so Makefile can add dependencies for config.recheck and config.gen 2017-06-30 Simon J. Gerraty * install-mk (MK_VERSION): 20170630 * meta.stage.mk: avoid triggering stage_* targets with nothing to do. 2017-05-23 Simon J. Gerraty * meta2deps.py: take special care of '..' 2017-05-15 Simon J. Gerraty * install-mk (MK_VERSION): 20170515 * dirdeps.mk (DEP_EXPORT_VARS): on rare occasions it is useful/necessary for a Makefile.depend file to export some knobs. This is complicated when we are doing DIRDEPS_CACHE, so we will handle export of any variables listed in DEP_EXPORT_VARS. 2017-05-08 Simon J. Gerraty * install-mk (MK_VERSION): 20170505 * meta2deps.py: fix botched indenation. 2017-05-05 Simon J. Gerraty * sys/*.mk: Remove setting of MAKE it is unnecessary and in many cases wrong (basname rather than full path) * scripts.mk (SCRIPTSGROUPS): make this more like files.mk and inc.mk * init.mk: define realbuild to simplify logic in {lib,prog}.mk etc 2017-05-01 Simon J. Gerraty * install-mk (MK_VERSION): 20170501 * doc.mk: fix typo in DOC_INSTALL_OWN * inc.mk: handle INCGROUPS similar to freebsd * files.mk: add something for files too * add staging logic to lib.mk prog.mk etc. 2017-04-24 Simon J. Gerraty * install-mk (MK_VERSION): 20170424 * dirdeps.mk: set NO_DIRDEPS when bootstrapping. also target of bootstrap-this when sed is needed should be ${_want:T} 2017-04-18 Simon J. Gerraty * install-mk (MK_VERSION): 20170418 * auto.obj.mk: if using MAKEOBJDIRPREFIX check if it is a prefix match for .CURDIR - in which case .CURDIR *is* __objdir. 2017-04-01 Simon J. Gerraty * install-mk (MK_VERSION): 20170401 * meta2deps.py: add is_src so we can check if obj dependency is also a src dependency. 2017-03-26 Simon J. Gerraty * install-mk (MK_VERSION): 20170326 * meta.stage.mk: do nothing if NO_STAGING is defined. 2017-03-24 Simon J. Gerraty * auto.obj.mk: handle the case of __objdir=obj or obj.${MACHINE} etc. 2017-03-18 Simon J. Gerraty * mkopt.sh: treat WITH_*=NO like no; ie. WITHOUT_* 2017-03-01 Simon J. Gerraty * install-mk (MK_VERSION): 20170301 * dirdeps.mk (_build_all_dirs): update this outside test for empty DIRDEPS. * meta.stage.mk: allow multiple inclusion to the extent it makes sense. 2017-02-14 Simon J. Gerraty * prog.mk (install_links): depends on realinstall 2017-02-12 Simon J. Gerraty * install-mk (MK_VERSION): 20170212 * dpadd.mk: avoid applying :T:R twice to DPLIBS entries 2017-01-30 Simon J. Gerraty * install-mk (MK_VERSION): 20170130 * dirdeps.mk: use :range if we can. * sys.vars.mk: provide M_cmpv if MAKE_VERSION >= 20170130 * meta2deps.py: clean paths without using realpath() where possible. fix sort_unique. 2016-12-12 Simon J. Gerraty * install-mk (MK_VERSION): 20161212 * meta2deps.py: set pid_cwd[pid] when we process 'C'hdir, rather than when we detect pid change. 2016-12-07 Simon J. Gerraty * install-mk (MK_VERSION): 20161207 * meta.stage.mk: add stage_as_and_symlink for staging packages. We build foo.tgz stage_as foo-${VERSION}.tgz but want to be able to use foo.tgz to reference the latest staged version - so we make foo.tgz a symlink to it. Using a target to do both operations ensures we stay in sync. 2016-11-26 Simon J. Gerraty * install-mk (MK_VERSION): 20161126 * dirdeps.mk: set DIRDEPS_CACHE before we include local.dirdeps.mk so it can add dependencies. 2016-10-10 Simon J. Gerraty * dirdeps.mk: set DEP_* before we expand .MAKE.DEPENDFILE_PREFERENCE do that they can influence the result correctly. * dirdeps.mk (${DIRDEPS_CACHE}): make sure we pass on TARGET_SPEC * dirdeps.mk: Add ONLY_TARGET_SPEC_LIST and NOT_TARGET_SPEC_LIST similar to ONLY_MACHINE_LIST and NOT_MACHINE_LIST 2016-10-05 Simon J. Gerraty * dirdeps.mk: remove dependence on jot (normal situations anyway). Before we read another Makefile.depend* set DEP_* vars from _DEP_TARGET_SPEC in case it uses any of them with := When bootstrapping, trim any ,* from extention of chosen _src Makefile.depend* to get the machine value we subst for. 2016-09-30 Simon J. Gerraty * dirdeps.mk: use TARGET_SPEC_VARS to qualify components added to DEP_SKIP_DIR and DEP_DIRDEPS_FILTER * sys.mk: extract some bits to sys.{debug,vars}.mk for easier re-use by others. 2016-09-23 Simon Gerraty * lib.mk: Use ${PICO} for extension for PIC objects. default to .pico (like NetBSD) safe on case insensitive filesystem. 2016-08-19 Simon J. Gerraty * meta.sys.mk (META_COOKIE_TOUCH): use ${.OBJDIR}/${.TARGET:T} as default 2016-08-15 Simon J. Gerraty * install-mk (MK_VERSION): 20160815 * dirdeps.mk (.MAKE.META.IGNORE_FILTER): set filter to only consider Makefile.depend* when checking if DIRDEPS_CACHE is up-to-date. 2016-08-13 Simon J. Gerraty * meta.sys.mk (.MAKE.META.IGNORE_PATHS): in meta mode we can ignore the mtime of makefiles 2016-08-02 Simon J. Gerraty * install-mk (MK_VERSION): 20160802 * lib.mk (libinstall): depends on beforinstall * prog.mk (proginstall): depends on beforinstall patch from Lauri Tirkkonen * dirdeps.mk (bootstrap): When bootstrapping; creat .MAKE.DEPENDFILE_DEFAULT and allow additional filtering via .MAKE.DEPENDFILE_BOOTSTRAP_SED * dirdeps.mk: move some comments to where they make sense. 2016-07-27 Simon J. Gerraty * dirdeps.mk (DIRDEPS_CACHE): no dirname. 2016-06-02 Simon J. Gerraty * install-mk (MK_VERSION): 20160602 * meta.autodep.mk: when passing META_FILES to gendirdeps.mk do not apply :T to META_XTRAS patch from Bryan Drewery at FreeBSD.org. 2016-05-30 Simon J. Gerraty * install-mk (MK_VERSION): 20160530 * meta.stage.mk: we assume ${CLEANFILES} gets .NOPATH make it so. 2016-05-12 Simon J. Gerraty * install-mk (MK_VERSION): 20160512 * dpadd.mk: always include local.dpadd.mk if it exists remove some things that better belong in local.dpadd.mk skip INCLUDES_* for staged libs unless SRC_* defined. * own.mk: add INCLUDEDIR 2016-04-18 Simon J. Gerraty * dirdeps.mk: when doing -f dirdeps.mk if target suppies no TARGET_MACHINE - :E will be empty or match part of path, use ${MACHINE} 2016-04-07 Simon J. Gerraty * meta.autodep.mk: issue a warning if UPDATE_DEPENDFILE=NO due to NO_FILEMON_COOKIE * dirdeps.mk: move the logic that allows for make -f dirdeps.mk some/dir.${TARGET_SPEC} inside the check for !target(_DIRDEP_USE) 2016-04-04 Simon J. Gerraty * Use <> when including local*.mk and others which may exist elsewhere so that user can better control what they get. * meta.autodep.mk (NO_FILEMON_COOKIE): create a cookie if we ever build dir with nofilemon so that UPDATE_DEPENDFILE will be forced to NO until cleaned. 2016-04-01 Simon J. Gerraty * install-mk (MK_VERSION): 20160401 * meta2deps.py: fix old print statement when debugging. * gendirdeps.mk: META2DEPS_CMD append M2D_EXCLUDES with -X patch from Bryan Drewery 2016-03-22 Simon J. Gerraty * install-mk (MK_VERSION): 20160317 (St. Pats) * warnings.mk: g++ does not like -Wimplicit * sys.mk sys/*.mk lib.mk prog.mk: use CXX_SUFFIXES to handle the pelthora of common suffixes for C++ * lib.mk: use .So for shared objects 2016-03-15 Simon J. Gerraty * install-mk (MK_VERSION): 20160315 * meta.stage.mk (LN_CP_SCRIPT): do not ln(1) if we have to chmod(1) normally only applies to scripts. * dirdeps.mk: NO_DIRDEPS_BELOW to supress DIRDEPS below RELDIR as well as outside it. 2016-03-10 Simon J. Gerraty * install-mk (MK_VERSION): 20160310 * dirdeps.mk: use targets rather than a list to track DIRDEPS that we have processed; the list gets very inefficient as number of DIRDEPS gets large. * sys.dependfile.mk: fix comment wrt MACHINE * meta.autodep.mk: ignore staged DPADDs when bootstrapping. patch from Bryan Drewery 2016-03-02 Simon J. Gerraty * meta2deps.sh: don't ignore subdirs. patch from Bryan Drewery 2016-02-26 Simon J. Gerraty * install-mk (MK_VERSION): 20160226 * gendirdeps.mk: mark _DEPENDFILE .NOMETA 2016-02-20 Simon J. Gerraty * dirdeps.mk: we shouldn't normally include .depend but if we do use .dinclude if we can. 2016-02-18 Simon J. Gerraty * install-mk (MK_VERSION): 20160218 * sys.clean-env.mk: with recent change to Var_Subst() we cannot use the '$$' trick, but .export-literal does the job we need. * auto.dep.mk: make use .dinclude if we can. 2016-02-05 Simon J. Gerraty * dirdeps.mk: Add _build_all_dirs such that local.dirdeps.mk can add fully qualified dirs to it. These will be built normally but the current DEP_RELDIR will not depend on then (to avoid cycles). This makes it easy to hook things like unit-tests into build. 2016-01-21 Simon J. Gerraty * dirdeps.mk: add bootstrap-empty 2015-12-12 Simon J. Gerraty * install-mk (MK_VERSION): 20151212 * auto.obj.mk: do not require MAKEOBJDIRPREFIX to exist. only apply :tA to __objdir when comparing to .OBJDIR 2015-11-14 Simon J. Gerraty * install-mk (MK_VERSION): 20151111 * meta.sys.mk: include sys.dependfile.mk * sys.mk (OPTIONS_DEFAULT_NO): use options.mk to set MK_AUTO_OBJ and MK_DIRDEPS_BUILD include local.sys.env.mk early include local.sys.mk later * own.mk (OPTIONS_DEFAULT_NO): AUTO_OBJ etc moved to sys.mk 2015-11-13 Simon J. Gerraty * meta.sys.mk (META_COOKIE_TOUCH): add ${META_COOKIE_TOUCH} to the end of scripts to touch cookie * meta.stage.mk: stage_libs should ignore SYMLINKS. 2015-10-23 Simon J. Gerraty * install-mk (MK_VERSION): 20151022 * sys.mk: BSD/OS does not have 'type' as a shell builtin. 2015-10-20 Simon J. Gerraty * install-mk (MK_VERSION): 20151020 * dirdeps.mk: Add logic for make -f dirdeps.mk some/dir.${TARGET_SPEC} 2015-10-14 Simon J. Gerraty * install-mk (MK_VERSION): 20151010 2015-10-02 Simon J. Gerraty * meta.stage.mk: use staging: ${STAGE_TARGETS:... to have stage_lins run last in non-jobs mode. Use .ORDER only for jobs mode. 2015-09-02 Simon J. Gerraty * rst2htm.mk: allow for per target flags etc. 2015-09-01 Simon J. Gerraty * install-mk (MK_VERSION): 20150901 * doc.mk: create dir if needed use DOC_INSTALL_OWN 2015-06-15 Simon J. Gerraty * install-mk (MK_VERSION): 20150615 * auto.obj.mk: allow use of MAKEOBJDIRPREFIX too. Follow make's normal precedence rules. * gendirdeps.mk: allow customization of the header. eg. for FreeBSD: GENDIRDEPS_HEADER= echo '\# ${FreeBSD:L:@v@$$$v$$ @:M*F*}'; * meta.autodep.mk: ignore dirdeps.cache* * meta.stage.mk: when bootstrapping options it can be handy to throw warnings rather than errors for staging conflicts. * meta.sys.mk: include local.meta.sys.mk for customization 2015-06-06 Simon J. Gerraty * install-mk (MK_VERSION): 20150606 * dirdeps.mk: don't rely on manually maintained Makefile.depend to set DEP_RELDIR and reset DIRDEPS. By setting DEP_RELDIR ourselves we can skip :tA * gendirdeps.mk: skip setting DEP_RELDIR. 2015-05-24 Simon J. Gerraty * dirdeps.mk: avoid wildcards like make(bootstrap*) 2015-05-20 Simon J. Gerraty * install-mk (MK_VERSION): 20150520 * dirdeps.mk: when we are building dirdeps cache file we *want* meta_oodate to look at all the Makefile.depend files, so set .MAKE.DEPENDFILE to something that won't match. * meta.stage.mk: for STAGE_AS_* basename of file may not be unique so first use absolute path as key. Also skip staging at level 0. 2015-04-30 Simon J. Gerraty * install-mk (MK_VERSION): 20150430 * dirdeps.mk: fix _count_dirdeps for non-cache case. 2015-04-16 Simon J. Gerraty * install-mk (MK_VERSION): 20150411 bump version * own.mk: put AUTO_OBJ in OPTIONS_DEFAULT_NO rather than YES. it is here mainly for documentation purposes, since if using auto.obj.mk it is better done via sys.mk 2015-04-01 Simon J. Gerraty * install-mk (MK_VERSION): 20150401 * meta2deps.sh: support @list * meta2deps.py: updates from Juniper o add EXCLUDES o skip bogus input files. o treat 'M' and 'L' as both an 'R' and a 'W' 2015-03-03 Simon J. Gerraty * install-mk (MK_VERSION): 20150303 * dirdeps.mk: if MK_DIRDEPS_CACHE is yes, use dirdeps-cache which is built via sub-make so we have a .meta file to tell if it is out-of-date. The dirdeps-cache contains the same dependency rules that we normaly construct on the fly. This adds a few seconds overhead when the cache is out of date, but for a large target, the savings can be significant (10-20min). 2014-11-18 Simon J. Gerraty * install-mk (MK_VERSION): 20141118 * meta.stage.mk: add stale_staged * dirdeps.mk (_DIRDEP_USE_LEVEL): allow this to be tweaked only useful under very rare conditions such as FreeBSD's make universe. * auto.obj.mk: Allow MK_AUTO_OBJ to set MKOBJDIRS=auto 2014-11-11 Simon J. Gerraty * install-mk (MK_VERSION): 20141111 * mkopt.sh: use consistent semantics for _mk_opt and _mk_opts 2014-11-09 Simon J. Gerraty * FILES: include mkopt.sh which allows handling options in shell scripts in a manner compatible with options.mk 2014-10-12 Simon J. Gerraty * meta.stage.mk: ensure only _STAGED_DIRS under objroot are used for GENDIRDEPS_FILTER to avoid surprises. 2014-10-10 Simon J. Gerraty * dirdeps.mk (NSkipHostDir): this needs SRCTOP prepended since by the time it is applied to __depdirs they have. * dirdeps.mk fix filtering of _machines since M_dep_qual_fixes expects patterns like *.${MACHINE} * cython.mk (pyprefix?): use pyprefix to find python bits since prefix might be something else (where we install our stuff) 2014-09-11 Simon J. Gerraty * install-mk (MK_VERSION): 20140911 * dirdeps.mk: add bootstrap target to simplify adding support for new MACHINE. 2014-09-01 Simon J. Gerraty * gendirdeps.mk: Add handling of GENDIRDEPS_FILTER_DIR_VARS and GENDIRDEPS_FILTER_VARS to make it easier to produce sharable Makefile.depend files. 2014-08-28 Simon J. Gerraty * install-mk (MK_VERSION): 20140828 * cython.mk: capture logic for building python extension modules with Cython. 2014-08-08 Simon J. Gerraty * meta.stage.mk (_STAGE_AS_BASENAME_USE): Add StageAs variant 2014-08-02 Simon J. Gerraty * install-mk (MK_VERSION): 20140801 * dep.mk: use explicit MKDEP_MK rather than overload MKDEP to identify the autodep.mk variant. * sys.dependfile.mk: delete .MAKE.DEPENDFILE if its initial value does not match .MAKE.DEPENDFILE_PREFIX * meta.autodep.mk: if _bootstrap_dirdeps add RELDIR to DIRDEPS 2014-05-22 Simon J. Gerraty * install-mk (MK_VERSION): 20140522 * lib.mk: use CC to link shlib for linux too patch from Brendan MacDonell 2014-05-05 Simon J. Gerraty * meta.autodep.mk: add _reldir_{finish,failed} for gathering stats if WITH_META_STATS is defined. 2014-05-02 Simon J. Gerraty * dirdeps.mk: accept -DWITHOUT_DIRDEPS (same a as -DNO_DIRDEPS) to supress dirdeps outside of .CURDIR. 2014-04-05 Simon J. Gerraty * Fix spelling errors - patch from Pedro Giffuni 2014-03-14 Simon J. Gerraty * install-mk (MK_VERSION): 20140314 * dirdeps.mk (beforedirdeps): a handy hook * dirdeps.mk (DIRDEP_MAKE): allow the actual command we run to visit leaf dirs to be intercepted (eg. for distributed build). * dirdeps.mk (__depdirs): ensure // don't sneak in * gendirdeps.mk (DIRDEPS): ensure // don't sneak in 2014-02-21 Simon J. Gerraty * rst2htm.mk (RST2PDF): add support for rst2pdf 2014-02-14 Simon J. Gerraty * install-mk (MK_VERSION): bump version * dirdeps.mk (_last_dependfile): use .INCLUDEDFROMFILE if available. 2014-02-10 Simon J. Gerraty * options.mk: avoid :U so this isn't bmake dependent 2014-02-09 Simon J. Gerraty * options.mk: cleanup and simplify semanitcs NO_* dominates all, if both WITH_* and WITHOUT_* are defined then result is DOMINATE_* which defaults to "no". Ie. WITHOUT_ normally wins. 2013-12-12 Simon J. Gerraty * install-mk (MK_VERSION): bump version * meta2deps.py: convert to print function for python3 compat. we also need to open files with mode 'r' rather than 'rb' otherwise we get bytes instead of strings. 2013-10-10 Simon J. Gerraty * install-mk (MK_VERSION): bump version * dirdeps.mk: when TARGET_SPEC_VARS is more than just MACHINE apply the same filtering (M_dep_qual_fixes) when setting _machines as _build_dirs. Also fix the filtering of Makefile.depend files - for reporting what we are looking for (M_dep_qual_fixes can get confused by Makefile.depend) Add some more debug info. 2013-09-04 Simon J. Gerraty * gendirdeps.mk (_objtops): fix typo also while processing M2D_OBJROOTS to gather qualdir_list qualify $ql with loop iterator to ensure correct results. 2013-08-01 Simon J. Gerraty * install-mk (MK_VERSION): 20130801 * libs.mk: update to match progs.mk 2013-07-26 Simon J. Gerraty * install-mk (MK_VERSION): 20130726 some updates from Juniper and FreeBSD o meta2deps.py: indicate file and line number when we hit parse errors also allow @file to provide huge list of .meta files. * meta2deps.py: add try_parse() to cleanup the above. 2013-07-16 Simon J. Gerraty * install-mk (MK_VERSION): 20130716 * own.mk: add GPROG as an option * prog.mk: honor MK_GPROF==yes 2013-05-10 Simon J. Gerraty * install-mk (MK_VERSION): 20130505 * gendirdeps.mk, meta2deps.py, meta2deps.sh: handle $TARGET_SPEC for when $MACHINE isn't enough for objdir distinction. Bring meta2deps.sh closer to par with meta2deps.py. 2013-04-18 Simon J. Gerraty * meta.stage.mk: set INSTALL to STAGE_INSTALL when making 'all' also if the target 'beforeinstall' exists, make it depend on .dirdep (incase it uses STAGE_INSTALL). 2013-04-17 Simon J. Gerraty * install-mk (MK_VERSION): 20130401 ;-) * meta.stage.mk (STAGE_INSTALL_SH): add stage-install.sh as wrapper around install(1). * options.mk (OPTION_PREFIX): Allow a prefix other than MK_ 2013-03-30 Simon J. Gerraty * meta2deps.py (MetaFile.__init__): ensure self.cwd is initialized. * install-mk (MK_VERSION): bump version 2013-03-21 Simon J. Gerraty * install-mk (MK_VERSION): bump version * gendirdeps.mk: do not apply :tA to DPADD entries, since we lose any trailing /., rather apply :tA only when needed. * gendirdeps.mk: better mimic meta2deps handling of .dirdep files. * meta.stage.mk (LN_CP_SCRIPT): Add LnCp to do the ln||cp dance consistently. * dirdeps.mk: better describe the dance in sys.mk for TARGET_SPEC. 2013-03-18 Simon J. Gerraty * gendirdeps.mk: revert the dance around .MAKE.DEPENDFILE_DEFAULT it is simpler to just not update when say building for "host" (where we know we apply filters to DIRDEPS), and using a non-machine qualified dependfile. 2013-03-16 Simon J. Gerraty * dirdeps.mk: improve DIRDEPS filtering by allowing DEP_SKIP_DIR and DEP_DIRDEPS_FILTER to vary by DEP_MACHINE and DEP_TARGET_SPEC * gendirdeps.mk: ensure _objroot has trailing / if it needs it. * meta2deps.py: if machine is "host", then also trim self.host_target from any OBJROOTS. 2013-03-11 Simon J. Gerraty * gendirdeps.mk: if .MAKE.DEPENDFILE_DEFAULT is not machine qualified but _DEPENDFILE is, and .MAKE.DEPENDFILE_DEFAULT exists but _DEPENDFILE does not, compare the new _DEPENDFILE against .MAKE.DEPENDFILE_DEFAULT and discard if the same. 2013-03-08 Simon J. Gerraty * meta.stage.mk: use STAGE_TARGETS to control .ORDER and hook to all: via staging: 2013-03-07 Simon J. Gerraty * sys.dependfile.mk (.MAKE.DEPENDFILE_DEFAULT): use a separate variable for the default .MAKE.DEPENDFILE value so that it can be controlled independently of .MAKE.DEPENDFILE_PREFERENCE * meta.stage.mk: throw error if cp fails etc. Stage*() return early if passed no args. .ORDER stage_* 2013-03-03 Simon J. Gerraty * install-mk (MK_VERSION): bump version * gendirdeps.mk: handle multiple M2D_OBJROOTS better. 2013-02-10 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20130210 * import latest dirdeps.mk, gendirdeps.mk and meta2deps.py from Juniper. o dirdeps.mk now fully supports TARGET_SPEC consisting of more than just MACHINE. o no longer use DEP_MACHINE from Makefile.depend* so remove it. 2013-01-23 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20130123 * meta.stage.mk: add stage_links (hard links). if doing hard links, we add dest to link as well. Default the stage dir for [sym]links to STAGE_OBJTOP since these are typically specified as absolute paths. Add -m "mode" flag to StageFiles and StageAs. 2012-11-11 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20121111 * autoconf.mk: avoid meta mode seeing changed commands for config.status * meta.autodep.mk: pass resolved MAKESYSPATH to gendirdeps in case we were found via .../mk * sys.clean-env.mk: move it from examples, we and others use it "as is". * FILES: add srctop.mk and options.mk * own.mk: convert to using options.mk which is modeled after FreeBSD's handling of MK_* but more flexible. This allows MK_* for boolean knobs to not be confused with MK* which can be commands. * examples/sys.clean-env.mk: add WITH[OUT]_ to MAKE_ENV_SAVE_PREFIX_LIST. Mention that HOME=/var/empty might be a good idea. 2012-11-08 Simon J. Gerraty * sys.dependfile.mk: if not depend file exists, $MACHINE specific ones are supported but not the default, check if any exist and follow suit. 2012-11-06 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20121106 2012-11-05 Simon J. Gerraty * import latest dirdeps.mk and meta2deps.py from Juniper. * progs.mk: add MAN and CXXFLAGS to PROG_VARS also add PROGS_TARGETS and pass on PROG_CXX if it seems appropriate. 2012-11-04 Simon J. Gerraty * meta.stage.mk: update CLEANFILES remove redundant cp of .dirdep from STAGE_AS_SCRIPT. * progs.mk: Add LDADD to PROG_VARS 2012-10-12 Simon J. Gerraty * meta.stage.mk (STAGE_DIR_FILTER): track dirs we stage to in _STAGED_DIRS so that these can be turned into filters for GENDIRDEPS_FILTER. 2012-10-10 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20121010 * meta.stage.mk (STAGE_DIRDEP_SCRIPT): check that an existing target.dirdep matches .dirdep 2012-08-08 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20120808 * import latest meta2deps.py from Juniper. 2012-07-11 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20120711 * dep.mk: add explicit dependencies on SRCS after applying SRCS_DEP_FILTER * meta.autodep.mk: add explicit dependencies on SRCS after applying SRCS_DEP_FILTER * meta.autodep.mk: ensure GENDIRDEPS_FILTER is exported if needed. 2012-06-26 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20120626 * meta.sys.mk: ignore PYTHON if it does not exist compare ${.MAKE.DEPENDFILE:E} against ${MACHINE} is more reliable. * meta.stage.mk: examine .MAKE.DEPENDFILE_PREFERENCE for any entries ending in .${MACHINE} to decide if qualified _dirdep is needed. * gendirdeps.mk: only produce unqualified deps if no .MAKE.DEPENDFILE_PREFERENCE ends in .${MACHINE} * meta.subdir.mk: apply SUBDIRDEPS_FILTER 2012-04-20 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20120420 * add sys.dependfile.mk so we can experiment with .MAKE.DEPENDFILE_PREFERENCE * meta.autodep.mk: _DEPENDFILE is precious! 2012-03-15 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20120315 * install-new.mk: avoid being interrupted 2012-02-26 Simon J. Gerraty * man.mk: MAN might have multiple values so be careful with exists(). 2012-01-19 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20120112 * fix examples/sys.clean-env.mk so that MAKEOBJDIR is handled as: MAKEOBJDIR='${.CURDIR:S,${SRCTOP},${OBJTOP},}' 2011-12-03 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20111201 * import dirdeps.mk from Juniper sjg@ o more consistent handling of DEP_MACHINE, especially when dealing with an odd Makefile.depend, when normally using Makefile.depend.${MACHINE} 2011-11-22 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20111122 * meta.autodep.mk: add some debug output, be more crisp about updating. Use ${.ALLTARGETS:M*.o} as a clue for .depend 2011-11-13 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20111111 it's too cool to miss * import meta* updates from Juniper sjg@ o dirdeps.mk set DEP_MACHINE for Makefile.depend (when we are normally using Makefile.depend.${MACHINE}), handy for read-only manually maintained dependencies. o meta2deps.py add a clear 'ERROR:' token if an exception is raised. o gendirdeps.mk if ERROR: from meta2deps.py do not update anything. 2011-10-30 Simon J. Gerraty * install-new.mk separate the cmp and copy logic to its own function. 2011-10-28 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20111028 * sys.mk: include auto.obj.mk if MKOBJDIRS is set to auto * subdir.mk: ensure _SUBDIRUSE is provided * meta.autodep.mk: remove dependency of gendirdeps.mk on auto.obj.mk * meta.subdir.mk: always allow for Makefile.depend 2011-10-10 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20111010 o minor tweak to *dirdeps.mk from Juniper sjg@ 2011-10-01 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20111001 o add meta2deps.py from Juniper sjg@ o tweak gendirdeps.mk to work with meta2deps.py when not cross-building * autoconf.mk: add autoconf-input as a hook for regenerating AUTOCONF_INPUTS (configure). 2011-08-24 Simon J. Gerraty * meta.autodep.mk: if we do not have OBJS, .depend isn't a useful trigger for updating Makefile.depend* 2011-08-08 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20110808 * obj.mk: minor cleanup * auto.obj.mk: improve description of Mkdirs and honor NO_OBJ too. 2011-08-01 Simon J. Gerraty * auto.obj.mk (.OBJDIR): throw an error if we cannot use the specified dir. 2011-06-28 Simon J. Gerraty * meta.autodep.mk: if XMAKE_META_FILE is set the makefile uses a foreign make, and so dependencies can only be gathered from a clean tree build. 2011-06-24 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20110622 * meta.autodep.mk: improve bootstraping 2011-06-10 Simon J. Gerraty * yacc.mk: handle the corner case of .c being removed while .h remains. 2011-06-08 Simon J. Gerraty * yacc.mk: do .y.h and .y.c separately 2011-06-04 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20110606 * don't store SRC_DIRDEPS in Makefile.depend* by default not everyone needs it. 2011-05-04 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20110505 first release including meta mode makefiles 2011-05-02 Simon J. Gerraty * meta.stage.mk: add STAGE_AS_SETS and stage_as for things that need to be staged with different names. 2011-05-01 Simon J. Gerraty * meta.stage.mk: add notion of STAGE_SETS so a makefile can stage to multiple dirs 2011-04-03 Simon J. Gerraty * rst2htm.mk: convert rst to s5 (slides) or plain html depending on target name. 2011-03-30 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20110330 2011-03-29 Simon J. Gerraty * sys.mk (_DEBUG_MAKE_FLAGS): use indirection so that DEBUG_MAKE_FLAGS0 can be used to debug level 0 only and DEBUG_MAKE_FLAGS for the rest. * sys.mk: re-define M_whence in terms of M_type. M_type is useful for checking if something is a builtin. 2011-03-16 Simon J. Gerraty * meta.stage.mk: add stage_symlinks and leverage StageLinks for stage_libs 2011-03-10 Simon J. Gerraty * dirdeps.mk: correct value for _depdir_files depends on .MAKE.DEPENDFILE Add our copyright - just to make it clear we have frobbed this quite a bit. DEP_MACHINE needs to be set to MACHINE each time, if using only Makefile.depend (cf. Makefile.depend.${MACHINE}) * meta.stage.mk: meta mode version of staging * init.mk, final.mk: include local.*.mk to simplify customization 2011-03-03 Simon J. Gerraty * auto.obj.mk: just because we are doing mk destroy, we should still set .OBJDIR correctly if it exists. * install-mk (mksrc): do not exclude meta.sys.mk 2011-03-01 Simon J. Gerraty * host-target.mk: set/export _HOST_ARCH etc separately, catch junk resulting from uname -p, so we can find sys/Linux.mk correctly. 2011-02-18 Simon J. Gerraty * meta.sys.mk: throw an error if /dev/filemon is missing and we expected to be updating Makefile.depend* 2011-02-14 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20110214 * meta.subdir.mk: add support for -DBOOTSTRAP_DEPENDFILES 2010-09-25 Simon J. Gerraty * meta.sys.mk: not valid for older bmake 2010-09-24 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20100919 include dirdeps.mk et al from Juniper Networks, for meta mode - requires filemon(9). * sys.mk, subdir.mk: Add hooks for meta mode. we do this as meta.sys.mk, meta.autodep.mk and meta.subdir.mk to make turning it on/off simple. 2010-06-16 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20100616 * fix typo in sys.mk 2010-06-12 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20100612 * lib.mk: remove duplicate addition to SOBJS 2010-06-10 Simon J. Gerraty * sys.mk: Add a means of selectively turning on debug flags. Eg. DEBUG_MAKE_FLAGS=-dv DEBUG_MAKE_DIRS="*lib/sjg" will act as if we did make -dv if .CURDIR ends in lib/sjg DEBUG_MAKE_SYS_DIRS does the same thing, but we set the flags at the start of sys.mk rather than the end. This only makes sense for leaf dirs, so we check that .MAKE.LEVEL > 0 2010-06-09 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20100608 * sys.mk: include sys.env.mk later so it can use M_ListToSkip et al. * examples/sys.clean-env.mk: require MAKE_VERIONS >= 20100606 also make it easier for folk to tweak 2010-06-08 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20100606 do not install examples/* * FILES: add examples/sys.clean-env.mk * examples/sys.clean-env.mk: use .export-env to handle MAKEOBJDIR this requires bmake-20100606 or later to work. 2010-05-13 Simon J. Gerraty * sys.mk (M_tA): better simulate the result of :tA if not available. 2010-05-04 Simon J. Gerraty * sys.mk: canonicalize MAKE_VERSION old versions reported bmake- build- whereas we only care about 2010-04-25 Simon J. Gerraty * install-mk: just warn about FORCE_{BSD,SYS}_MK being ignored * lib.mk: we only build the shared lib if SHLIB_FULLVERSION is !empty 2010-04-22 Simon J. Gerraty * dpadd.mk: use LDADD_* if defined. 2010-04-21 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20100420 * sys/NetBSD.mk: add MACHINE_CPU to keep netbsd makefiles happy * autoconf.mk allow AUTO_AUTOCONF 2010-04-19 Simon J. Gerraty * obj.mk: add objwarn to keep freebsd makefiles happy * auto.obj.mk: ensure Mkdirs is available. * FILES: add auto.dep.mk - a simpler version of autodep.mk * dep.mk: auto.dep.mk does not do 'make depend' so ignore it if asked to do that. fix/simplify the tests for when to run mkdep. * auto.dep.mk: add some explanation of how/what we do. * autodep.mk: skip the .OPTIONAL frobbing of .depend bmake's FROM_DEPEND flag makes it redundant. 2010-04-13 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20100404 * subdir.mk: protect from multiple inclusion using _SUBDIRUSE. * obj.mk: protect from multiple inclusion even as bsd.obj.mk Also create a target _SUBDIRUSE so that we can be used without subdir.mk 2010-04-12 Simon J. Gerraty * dep.mk: use <> when .including so can override. 2010-01-11 Simon J. Gerraty * lib.mk (SHLIB_LINKS): ensure a string comparison. 2010-01-04 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20100102 * own.mk: ensure PRINTOBJDIR works * autoconf.mk: pass on CONFIGURE_ARGS * init.mk: handle COPTS.${.IMPSRC:T} etc. * lib.mk: allow sys.mk to control SHLIB_FULLVERSION fix handling of symlinks for darwin * libnames.mk: add DSHLIBEXT for libs which only exist as shared. * man.mk: suppress chown when not root. * rst2htm.mk: allow srcs from multiple locations. * sys.mk: M_whence, stop after 1st line of output. * sys/Darwin.mk: Use .dylib for DSHLIBEXT and HOST_LIBEXT * sys/SunOS.mk: we need to export PATH 2009-12-23 Simon J. Gerraty * install-mk (MK_VERSION): bump version include rst2htm.mk 2009-12-17 Simon J. Gerraty * sys.mk,libnames.mk add .-include this allows local customization without the need to edit the distributed files. 2009-12-14 Simon J. Gerraty * dpadd.mk (__dpadd_libdirs): order -L's to avoid picking up older versions already installed. 2009-12-13 Simon J. Gerraty * stage.mk (.stage-install): generalize lib.mk's .libinstall * rules.mk rules for generic Makefile. * inc.mk install for includes. 2009-12-11 Simon J. Gerraty * sys/NetBSD.mk (MAKE_VERSION): some of our *.mk want to check this, so provide it if using native make. 2009-12-10 Simon J. Gerraty * FILES: move all the platform *.sys.mk files to sys/*.mk * Rename Generic.sys.mk to sys.mk - we always want it. 2009-11-17 Simon J. Gerraty * install-mk (MK_VERSION): bump version * host-target.mk: only export the expensive stuff * Generic.sys.mk (sys_mk): for SunOS we need to look for ${HOST_OS}.${HOST_OSMAJOR} too! 2009-11-07 Simon J. Gerraty * install-mk (MK_VERSION): bump version * lib.mk: if sys.mk doesn't give us an lorder, don't use it. based on patch from Greg Olszewski. * Generic.sys.mk: if we have nothing to work with set LORDER etc only if we can find it. 2009-09-08 Simon J. Gerraty * install-mk (MK_VERSION): bump version * man.mk: cleanman: remove CLEANMAN if defined. 2009-09-04 Simon J. Gerraty * SunOS.5.sys.mk (CC): Use ?= like the other *sys.mk 2009-07-17 Simon J. Gerraty * install-mk (MK_VERSION): bump version include auto.obj.mk 2009-03-26 Simon J. Gerraty * prog.mk,lib.mk: ensure test of USE_DPADD_MK doesn't fail. 2008-11-11 Simon J. Gerraty * install-mk (MK_VERSION): bump version man.mk: ensure we generate *.cat1 etc in . 2008-07-16 Simon J. Gerraty * install-mk (MK_VERSION): bump version add prlist.mk 2007-11-25 Simon J. Gerraty * Generic.sys.mk: Allow os specific sys.mk to be in a subdir of ${.PARSEDIR} 2007-11-22 Simon J. Gerraty * install-mk (MK_VERSION): bump version * general cleanup * dpadd.mk introduce DPMAGIC_LIBS_* 2007-04-30 Simon J. Gerraty * install-mk (MK_VERSION): bump version * libs.mk, progs.mk, autodep.mk: allow for per lib/prog depend files and ensure clean is called for each lib/prog. 2007-03-27 Simon J. Gerraty * autodep.mk (.depend): delete lines that do not start with space and do not contain ':' 2007-02-16 Simon J. Gerraty * autodep.mk (.depend): gcc may wrap lines if pathnames are long so make sure the transform for .OPTIONAL copes. 2007-02-03 Simon J. Gerraty * install-mk (MK_VERSION): bump version * own.mk: make sure RM and LN are defined. * obj.mk: fix a typo, and objlink target. 2006-12-30 Simon J. Gerraty * install-mk (MK_VERSION): bump version * added libs.mk - analogous to progs.mk make both of them always inlcude {lib,prog}.mk 2006-12-28 Simon J. Gerraty * progs.mk: add a means of building multiple apps in one dir. 2006-11-26 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20061126 * warnings.mk: detect invalid WARNINGS_SET * warnings.mk: use ${.TARGET:T:R}.o when looking for target specific warnings. * For .cc sources, turn off warnings that g++ vomits on. 2006-11-08 Simon J. Gerraty * own.mk: if __initialized__ target doesn't exist and we are FreeBSD we got here directly from sys.mk 2006-11-06 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20061106 add scripts.mk 2006-03-18 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20060318 * autodep.mk: avoid := when modifying OBJS into __dependsrcs 2006-03-02 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20060302 * autodep.mk: use -MF et al to help gcc+ccache DTRT. 2006-03-01 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20060301 * autodep.mk (.depend): if MAKE_VERSION is newer than 20050530 we can make .END depend on .depend and make .depend depend on __depsrcs that exist. * dpadd.mk: add SRC_PATHADD 2005-11-04 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20051104 * prog.mk: remove all the LIBC?= junk, use .-include libnames.mk instead (none by default). also if USE_DPADD_MK is set, include that. 2005-10-09 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20051001 Add UnixWare.sys.mk from Klaus Heinz. 2005-04-05 Simon J. Gerraty * install-mk: always install *.sys.mk and if need be symlink one to sys.mk 2005-03-22 Simon J. Gerraty * subdir.mk, own.mk: use .MAKE rather than MAKE 2004-02-15 Simon J. Gerraty * own.mk: don't use NetBSD's _SRC_TOP_ it can cause confusion. Also don't take just 'mk' as a srctop indicator. 2004-02-14 Simon J. Gerraty * warnings.mk: overhauled, now very powerful. 2004-02-03 Simon J. Gerraty * Generic.sys.mk: need to use ${.PARSEDIR} with exists(). 2004-02-01 Simon J. Gerraty * install-mk (MK_VERSION): bump version to 20040201 * extract HOST_TARGET stuff to host-target.mk so own.mk and Generic.sys.mk can share. * fix typo in autodep.mk _SUBDIRUSE not _SUBDIR. 2003-09-30 Simon J. Gerraty * install-mk (MK_VERSION): 20030930 * rename generic.sys.mk to Generic.sys.mk so that it does not get installed (unless being used as sys.mk) * set OS and ROOT_GROUP for those that we know the value. for others (eg. Generic.sys.mk) wrap the != in an .ifndef so we don't do it again for each sub-make. 2003-09-28 Simon J. Gerraty * install-mk (MK_VERSION): 20030928 Add some extra *.sys.mk from bootstrap-pkgsrc some of these likely still need work. Make everything default to root:wheel ownership, sys.mk can set ROOT_GROUP accordingly. 2003-08-07 Simon J. Gerraty * install-mk: if FORCE_BSD_MK={cp,ln} use the ones in SYS_MK_DIR not the portable ones. 2003-07-31 Simon J. Gerraty * install-mk: add ability to use cp -f when updating destination .mk files. Also now possible to play games with FORCE_SYS_MK=ln etc on *BSD machines to link /usr/share/mk/sys.mk into dest - not recommended unless you seriously want to. 2003-07-28 Simon J. Gerraty * own.mk (IMPFLAGS): add support for COPTS.${IMPSRC:T} etc for semi-compatability with NetBSD. 2003-07-23 Simon J. Gerraty * install-mk: add a version indicator 2003-07-22 Simon J. Gerraty * prog.mk: don't try and use ${LIBCRT0} if its /dev/null * install-mk: Allow FORCE_SYS_MK to come from env diff --git a/mk/dirdeps-options.mk b/mk/dirdeps-options.mk index 74f54a4cf665..4e907e66141e 100644 --- a/mk/dirdeps-options.mk +++ b/mk/dirdeps-options.mk @@ -1,100 +1,101 @@ -# $Id: dirdeps-options.mk,v 1.17 2020/08/07 01:57:38 sjg Exp $ +# $Id: dirdeps-options.mk,v 1.18 2020/12/22 18:10:34 sjg Exp $ # # @(#) Copyright (c) 2018-2020, Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise # use this file is hereby granted provided that # the above copyright notice and this notice are # left intact. # # Please send copies of changes and bug-fixes to: # sjg@crufty.net # ## # # This makefile is used to deal with optional DIRDEPS. # # It is to be included by Makefile.depend.options in a # directory which has DIRDEPS affected by optional features. # Makefile.depend.options should set DIRDEPS_OPTIONS and # may also set specific DIRDEPS.* for those options. # # If a Makefile.depend.options file exists, it will be included by # dirdeps.mk and meta.autodep.mk # # We include local.dirdeps-options.mk which may also define DIRDEPS.* # for options. # # Thus a directory, that is affected by an option FOO would have # a Makefile.depend.options that sets # DIRDEPS_OPTIONS= FOO # It can also set either/both of # DIRDEPS.FOO.yes # DIRDEPS.FOO.no # to whatever applies for that dir, or it can rely on globals # set in local.dirdeps-options.mk # Either way, we will .undef DIRDEPS.* when done. # # In some cases the value of MK_FOO might depend on TARGET_SPEC # so we qualify MK_FOO with .${TARGET_SPEC} and each component # TARGET_SPEC_VAR (in reverse order) before using MK_FOO. # # This should have been set by Makefile.depend.options # before including us DIRDEPS_OPTIONS ?= # pickup any DIRDEPS.* we need .-include .if ${.MAKE.LEVEL} == 0 # :U below avoids potential errors when we := # some options can depend on TARGET_SPEC! DIRDEPS_OPTIONS_QUALIFIER_LIST ?= \ ${DEP_TARGET_SPEC:U${TARGET_SPEC}} \ ${TARGET_SPEC_VARSr:U${TARGET_SPEC_VARS}:@v@${DEP_$v:U${$v}}@} # note that we need to include $o in the variable _o$o # to ensure correct evaluation. .for o in ${DIRDEPS_OPTIONS} -.undef _o$o _v$o +.undef _o$o +.undef _v$o .for x in ${DIRDEPS_OPTIONS_QUALIFIER_LIST} .if defined(MK_$o.$x) _o$o ?= MK_$o.$x _v$o ?= ${MK_$o.$x} .endif .endfor _v$o ?= ${MK_$o} .if ${_debug_reldir:U0} .info ${DEP_RELDIR:U${RELDIR}}.${DEP_TARGET_SPEC:U${TARGET_SPEC}}: o=$o ${_o$o:UMK_$o}=${_v$o:U} DIRDEPS += ${DIRDEPS.$o.${_v$o:U}:U} .endif DIRDEPS += ${DIRDEPS.$o.${_v$o:U}:U} .endfor DIRDEPS := ${DIRDEPS:O:u} .if ${_debug_reldir:U0} .info ${DEP_RELDIR:U${RELDIR}}: DIRDEPS=${DIRDEPS} .endif # avoid cross contamination .for o in ${DIRDEPS_OPTIONS} .undef DIRDEPS.$o.yes .undef DIRDEPS.$o.no .undef _o$o .undef _v$o .endfor .else # whether options are enabled or not, # we want to filter out the relevant DIRDEPS.* # we should only be included by meta.autodep.mk # if dependencies are to be updated .for o in ${DIRDEPS_OPTIONS} .for d in ${DIRDEPS.$o.yes} ${DIRDEPS.$o.no} .if exists(${SRCTOP}/$d) GENDIRDEPS_FILTER += N$d* .elif exists(${SRCTOP}/${d:R}) GENDIRDEPS_FILTER += N${d:R}* .endif .endfor .endfor .endif diff --git a/mk/dirdeps-targets.mk b/mk/dirdeps-targets.mk index 73dcf3639d3b..6201efe1e402 100644 --- a/mk/dirdeps-targets.mk +++ b/mk/dirdeps-targets.mk @@ -1,171 +1,172 @@ # RCSid: -# $Id: dirdeps-targets.mk,v 1.22 2020/08/15 18:00:11 sjg Exp $ +# $Id: dirdeps-targets.mk,v 1.24 2020/12/11 18:15:43 sjg Exp $ # # @(#) Copyright (c) 2019-2020 Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise # use this file is hereby granted provided that # the above copyright notice and this notice are # left intact. # # Please send copies of changes and bug-fixes to: # sjg@crufty.net # ## # This makefile is used to set initial DIRDEPS for top-level build # targets. # # The basic idea is that we have a list of directories in # DIRDEPS_TARGETS_DIRS which are relative to SRCTOP. # When asked to make 'foo' we look for any directory named 'foo' # under DIRDEPS_TARGETS_DIRS. # We then search those dirs for any Makefile.depend* # Finally we select any that match conditions like REQUESTED_MACHINE # or TARGET_SPEC and initialize DIRDEPS accordingly. # # We will check each of the initial DIRDEPS for Makefile.dirdeps.options # and include any found. # This makes it feasible to tweak options like MK_DIRDEPS_CACHE # for a specific target. # # If MK_STATIC_DIRDEPS_CACHE is defined we will check if the # initial DIRDEPS has a static cache (Makefile.dirdeps.cache). # This only makes sense for seriously expensive targets. # .if ${.MAKE.LEVEL} == 0 # pickup customizations .-include # for DIRDEPS_BUILD this is how we prime the pump +# include . to allow any directory to work as a target DIRDEPS_TARGETS_DIRS ?= targets targets/pseudo # these prefixes can modify how we behave # they need to be stripped when looking for target dirs DIRDEPS_TARGETS_PREFIX_LIST ?= pkg- build- # some .TARGETS need filtering DIRDEPS_TARGETS_FILTER += Nall # matching target dirs if any tdirs := ${.TARGETS:${DIRDEPS_TARGETS_FILTER:ts:}:${DIRDEPS_TARGETS_PREFIX_LIST:@p@S,^$p,,@:ts:}:@t@${DIRDEPS_TARGETS_DIRS:@d@$d/$t@}@:@d@${exists(${SRCTOP}/$d):?$d:}@} .if !empty(DEBUG_DIRDEPS_TARGETS) .info tdirs=${tdirs} .endif .if !empty(tdirs) # some things we know we want to ignore DIRDEPS_TARGETS_SKIP_LIST += \ *~ \ *.bak \ *.inc \ *.old \ *.options \ *.orig \ *.rej \ # the list of MACHINEs we consider DIRDEPS_TARGETS_MACHINE_LIST += \ ${ALL_MACHINE_LIST:U} \ ${PSEUDO_MACHINE_LIST:Ucommon host host32} \ ${TARGET_MACHINE_LIST} DIRDEPS_TARGETS_MACHINE_LIST := ${DIRDEPS_TARGETS_MACHINE_LIST:O:u} # raw Makefile.depend* list -tdeps != 'cd' ${SRCTOP} && 'ls' -1 ${tdirs:O:u:@d@$d/${.MAKE.DEPENDFILE_PREFIX}*@} 2> /dev/null; echo +tdeps != 'cd' ${SRCTOP} && 'ls' -1 ${tdirs:O:u:@d@$d/${.MAKE.DEPENDFILE_PREFIX}*@:S,^./,,} 2> /dev/null; echo .if ${DEBUG_DIRDEPS_TARGETS:U:Mdep*} != "" .info tdeps=${tdeps} .endif # remove things we know we don't want tdeps := ${tdeps:${DIRDEPS_TARGETS_SKIP_LIST:${M_ListToSkip}}} .if ${DEBUG_DIRDEPS_TARGETS:U:Mdep*} != "" .info tdeps=${tdeps} .endif # plain entries (no qualifiers) these apply to any TARGET_SPEC ptdeps := ${tdeps:M*${.MAKE.DEPENDFILE_PREFIX}:S,/${.MAKE.DEPENDFILE_PREFIX},,} # MACHINE qualified entries mqtdeps := ${DIRDEPS_TARGETS_MACHINE_LIST:@m@${tdeps:M*.$m}@:S,/${.MAKE.DEPENDFILE_PREFIX},,} tqtdeps = .if ${TARGET_SPEC_VARS:[#]} > 1 # TARGET_SPEC qualified entries .if !empty(TARGET_SPEC_LIST) # we have a list of valid TARGET_SPECS; use it tqtdeps := ${TARGET_SPEC_LIST:U:O:u:@t@${tdeps:M*.$t}@:S,/${.MAKE.DEPENDFILE_PREFIX},,} .else # do we have a list of valid tuple members for at least # the last tupple element? if so match on that TARGET_SPEC_LAST_LIST ?= ${${TARGET_SPEC_VARS:[-1]}_LIST} .if !empty(TARGET_SPEC_LAST_LIST) tqtdeps := ${TARGET_SPEC_LAST_LIST:U:O:u:@t@${tdeps:M*,$t}@:S,/${.MAKE.DEPENDFILE_PREFIX},,} .else # this is sub-optimal match MACHINE, tqtdeps := ${DIRDEPS_TARGETS_MACHINE_LIST:@m@${tdeps:M*.$m,*}@:S,/${.MAKE.DEPENDFILE_PREFIX},,} .endif .endif .endif # now work out what we want in DIRDEPS .if empty(REQUESTED_MACHINE) # we want them all just as found DIRDEPS = ${ptdeps} ${mqtdeps} ${tqtdeps} .else # we only want those that match REQUESTED_MACHINE/REQUESTED_TARGET_SPEC # or REQUESTED_TARGET_SPEC (TARGET_SPEC) DIRDEPS = \ ${ptdeps:@d@$d.${REQUESTED_TARGET_SPEC:U${TARGET_SPEC:U${REQUESTED_MACHINE}}}@} \ ${mqtdeps:M*.${REQUESTED_MACHINE}} \ ${tqtdeps:M*.${REQUESTED_TARGET_SPEC:U${TARGET_SPEC}}} .endif # clean up DIRDEPS := ${DIRDEPS:O:u} .if !empty(DEBUG_DIRDEPS_TARGETS) .for x in tdeps ptdeps mqtdeps tqtdeps DIRDEPS .info $x=${$x} .endfor .endif .endif # if we got DIRDEPS get to work .if !empty(DIRDEPS) DIRDEPS.dirs := ${DIRDEPS:S,^,${SRCTOP}/,:@d@${exists($d):?$d:${d:R}}@} -# some targets what to tweak options we might want to process now +# some targets want to tweak options we might want to process now .for m in ${DIRDEPS.dirs:S,$,/Makefile.dirdeps.options,} .-include <$m> .endfor .if defined(MK_STATIC_DIRDEPS_CACHE) # some targets are very expensive to compute dirdeps for # so we may have a static cache .for c in ${DIRDEPS.dirs:S,$,/Makefile.dirdeps.cache,} .if exists($c) STATIC_DIRDEPS_CACHE ?= $c .if ${MK_STATIC_DIRDEPS_CACHE} == "yes" DIRDEPS_CACHE ?= $c MK_DIRDEPS_CACHE = yes .endif .endif .endfor .if defined(STATIC_DIRDEPS_CACHE) .export STATIC_DIRDEPS_CACHE .endif .endif # allow a top-level makefile to do other stuff # before including dirdeps.mk .if ${MK_DIRDEPS_TARGETS_INCLUDE_DIRDEPS:Uyes} == "yes" .include .endif DIRDEPS_TARGETS_SKIP += all clean* destroy* .for t in ${.TARGETS:${DIRDEPS_TARGETS_SKIP:${M_ListToSkip}}} $t: dirdeps .endfor .endif .endif diff --git a/mk/dirdeps.mk b/mk/dirdeps.mk index 237d4c7e74aa..c8f03df01c9c 100644 --- a/mk/dirdeps.mk +++ b/mk/dirdeps.mk @@ -1,871 +1,856 @@ -# $Id: dirdeps.mk,v 1.130 2020/11/02 00:34:30 sjg Exp $ +# $Id: dirdeps.mk,v 1.131 2021/01/07 00:57:51 sjg Exp $ -# Copyright (c) 2010-2020, Simon J. Gerraty +# Copyright (c) 2010-2021, Simon J. Gerraty # Copyright (c) 2010-2018, Juniper Networks, Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Much of the complexity here is for supporting cross-building. # If a tree does not support that, simply using plain Makefile.depend # should provide sufficient clue. # Otherwise the recommendation is to use Makefile.depend.${MACHINE} # as expected below. # Note: this file gets multiply included. # This is what we do with DIRDEPS # DIRDEPS: # This is a list of directories - relative to SRCTOP, it is # normally only of interest to .MAKE.LEVEL 0. # In some cases the entry may be qualified with a . # or . suffix (see TARGET_SPEC_VARS below), # for example to force building something for the pseudo # machines "host" or "common" regardless of current ${MACHINE}. # # All unqualified entries end up being qualified with .${TARGET_SPEC} # and partially qualified (if TARGET_SPEC_VARS has multiple # entries) are also expanded to a full .. # The _DIRDEP_USE target uses the suffix to set TARGET_SPEC # correctly when visiting each entry. # # The fully qualified directory entries are used to construct a # dependency graph that will drive the build later. # # Also, for each fully qualified directory target, we will search # using ${.MAKE.DEPENDFILE_PREFERENCE} to find additional # dependencies. We use Makefile.depend (default value for # .MAKE.DEPENDFILE_PREFIX) to refer to these makefiles to # distinguish them from others. # # Before each Makefile.depend file is read, we set # DEP_RELDIR to be the RELDIR (path relative to SRCTOP) for # its directory, and DEP_MACHINE etc according to the . # represented by the suffix of the corresponding target. # # Since each Makefile.depend file includes dirdeps.mk, this # processing is recursive and results in .MAKE.LEVEL 0 learning the # dependencies of the tree wrt the initial directory (_DEP_RELDIR). # # TARGET_SPEC_VARS # The default value is just MACHINE, and for most environments # this is sufficient. The _DIRDEP_USE target actually sets # both MACHINE and TARGET_SPEC to the suffix of the current # target so that in the general case TARGET_SPEC can be ignored. # # If more than MACHINE is needed then sys.mk needs to decompose # TARGET_SPEC and set the relevant variables accordingly. # It is important that MACHINE be included in and actually be # the first member of TARGET_SPEC_VARS. This allows other # variables to be considered optional, and some of the treatment # below relies on MACHINE being the first entry. # Note: TARGET_SPEC cannot contain any '.'s so the target # triple used by compiler folk won't work (directly anyway). # # For example: # # # Always list MACHINE first, # # other variables might be optional. # TARGET_SPEC_VARS = MACHINE TARGET_OS # .if ${TARGET_SPEC:Uno:M*,*} != "" # _tspec := ${TARGET_SPEC:S/,/ /g} # MACHINE := ${_tspec:[1]} # TARGET_OS := ${_tspec:[2]} # # etc. # # We need to stop that TARGET_SPEC affecting any submakes # # and deal with MACHINE=${TARGET_SPEC} in the environment. # TARGET_SPEC = # # export but do not track # .export-env TARGET_SPEC # .export ${TARGET_SPEC_VARS} # .for v in ${TARGET_SPEC_VARS:O:u} # .if empty($v) # .undef $v # .endif # .endfor # .endif # # make sure we know what TARGET_SPEC is # # as we may need it to find Makefile.depend* # TARGET_SPEC = ${TARGET_SPEC_VARS:@v@${$v:U}@:ts,} # # The following variables can influence the initial DIRDEPS # computation with regard to the TARGET_SPECs that will be # built. # Most should also be considered by init.mk # # ONLY_TARGET_SPEC_LIST # Defines a list of TARGET_SPECs for which the current # directory can be built. # If ALL_MACHINES is defined, we build for all the # TARGET_SPECs listed. # # ONLY_MACHINE_LIST # As for ONLY_TARGET_SPEC_LIST but only specifies # MACHINEs. # # NOT_TARGET_SPEC_LIST # A list of TARGET_SPECs for which the current # directory should not be built. # # NOT_MACHINE_LIST # A list of MACHINEs the current directory should not be # built for. # # _build_xtra_dirs # local.dirdeps.mk can add targets to this variable. # They will be hooked into the build, but independent of # any other DIRDEP. # # This allows for adding TESTS to the build, such that the build # if any test fails, but without the risk of introducing # circular dependencies. now_utc ?= ${%s:L:gmtime} .if !defined(start_utc) start_utc := ${now_utc} .endif .if !target(bootstrap) && (make(bootstrap) || \ make(bootstrap-this) || \ make(bootstrap-recurse) || \ make(bootstrap-empty)) # disable most of below .MAKE.LEVEL = 1 .endif # touch this at your peril _DIRDEP_USE_LEVEL?= 0 .if ${.MAKE.LEVEL} == ${_DIRDEP_USE_LEVEL} # only the first instance is interested in all this .if !target(_DIRDEP_USE) # do some setup we only need once _CURDIR ?= ${.CURDIR} _OBJDIR ?= ${.OBJDIR} .if ${MAKEFILE:T} == ${.PARSEFILE} && empty(DIRDEPS) && ${.TARGETS:Uall:M*/*} != "" # This little trick let's us do # # mk -f dirdeps.mk some/dir.${TARGET_SPEC} # all: ${.TARGETS:Nall}: all DIRDEPS := ${.TARGETS:M*[/.]*} # so that -DNO_DIRDEPS works DEP_RELDIR := ${DIRDEPS:[1]:R} # this will become DEP_MACHINE below TARGET_MACHINE := ${DIRDEPS:[1]:E:C/,.*//} .if ${TARGET_MACHINE:N*/*} == "" TARGET_MACHINE := ${MACHINE} .endif # disable DIRDEPS_CACHE as it does not like this trick MK_DIRDEPS_CACHE = no .endif # make sure we get the behavior we expect .MAKE.SAVE_DOLLARS = no # make sure these are empty to start with _DEP_TARGET_SPEC = # If TARGET_SPEC_VARS is other than just MACHINE # it should be set by sys.mk or similar by now. # TARGET_SPEC must not contain any '.'s. TARGET_SPEC_VARS ?= MACHINE # this is what we started with TARGET_SPEC = ${TARGET_SPEC_VARS:@v@${$v:U}@:ts,} # this is what we mostly use below DEP_TARGET_SPEC = ${TARGET_SPEC_VARS:S,^,DEP_,:@v@${$v:U}@:ts,} # make sure we have defaults .for v in ${TARGET_SPEC_VARS} DEP_$v ?= ${$v} .endfor .if ${TARGET_SPEC_VARS:[#]} > 1 # Ok, this gets more complex (putting it mildly). # In order to stay sane, we need to ensure that all the build_dirs # we compute below are fully qualified wrt DEP_TARGET_SPEC. # The makefiles may only partially specify (eg. MACHINE only), # so we need to construct a set of modifiers to fill in the gaps. .if ${MAKE_VERSION} >= 20170130 _tspec_x := ${TARGET_SPEC_VARS:range} .else # do it the hard way _tspec_x := ${TARGET_SPEC_VARS:[#]:@x@i=1;while [ $$i -le $x ]; do echo $$i; i=$$((i + 1)); done;@:sh} .endif # this handles unqualified entries M_dep_qual_fixes = C;(/[^/.,]+)$$;\1.$${DEP_TARGET_SPEC}; # there needs to be at least one item missing for these to make sense .for i in ${_tspec_x:[2..-1]} _tspec_m$i := ${TARGET_SPEC_VARS:[2..$i]:@w@[^,]+@:ts,} _tspec_a$i := ,${TARGET_SPEC_VARS:[$i..-1]:@v@$$$${DEP_$v}@:ts,} M_dep_qual_fixes += C;(\.${_tspec_m$i})$$;\1${_tspec_a$i}; .endfor TARGET_SPEC_VARSr := ${TARGET_SPEC_VARS:[-1..1]} .else # A harmless? default. M_dep_qual_fixes = U .endif .if !defined(.MAKE.DEPENDFILE_PREFERENCE) # .MAKE.DEPENDFILE_PREFERENCE makes the logic below neater? # you really want this set by sys.mk or similar .MAKE.DEPENDFILE_PREFERENCE = ${_CURDIR}/${.MAKE.DEPENDFILE:T} .if ${.MAKE.DEPENDFILE:E} == "${TARGET_SPEC}" .if ${TARGET_SPEC} != ${MACHINE} .MAKE.DEPENDFILE_PREFERENCE += ${_CURDIR}/${.MAKE.DEPENDFILE:T:R}.$${MACHINE} .endif .MAKE.DEPENDFILE_PREFERENCE += ${_CURDIR}/${.MAKE.DEPENDFILE:T:R} .endif .endif _default_dependfile := ${.MAKE.DEPENDFILE_PREFERENCE:[1]:T} _machine_dependfiles := ${.MAKE.DEPENDFILE_PREFERENCE:T:M*${MACHINE}*} # for machine specific dependfiles we require ${MACHINE} to be at the end # also for the sake of sanity we require a common prefix .if !defined(.MAKE.DEPENDFILE_PREFIX) # knowing .MAKE.DEPENDFILE_PREFIX helps .if !empty(_machine_dependfiles) .MAKE.DEPENDFILE_PREFIX := ${_machine_dependfiles:[1]:T:R} .else .MAKE.DEPENDFILE_PREFIX := ${_default_dependfile:T} .endif .endif # this is how we identify non-machine specific dependfiles N_notmachine := ${.MAKE.DEPENDFILE_PREFERENCE:E:N*${MACHINE}*:${M_ListToSkip}} .endif # !target(_DIRDEP_USE) # First off, we want to know what ${MACHINE} to build for. # This can be complicated if we are using a mixture of ${MACHINE} specific # and non-specific Makefile.depend* # if we were included recursively _DEP_TARGET_SPEC should be valid. .if empty(_DEP_TARGET_SPEC) -# we may or may not have included a dependfile yet -.if defined(.INCLUDEDFROMFILE) -_last_dependfile := ${.INCLUDEDFROMFILE:M${.MAKE.DEPENDFILE_PREFIX}*} -.else -_last_dependfile := ${.MAKE.MAKEFILES:M*/${.MAKE.DEPENDFILE_PREFIX}*:[-1]} -.endif -.if ${_debug_reldir:U0} -.info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: _last_dependfile='${_last_dependfile}' -.endif - -.if empty(_last_dependfile) || ${_last_dependfile:E:${N_notmachine}} == "" -# this is all we have to work with -DEP_MACHINE = ${TARGET_MACHINE:U${MACHINE}} -_DEP_TARGET_SPEC := ${DEP_TARGET_SPEC} -.else -_DEP_TARGET_SPEC = ${_last_dependfile:${M_dep_qual_fixes:ts:}:E} -.endif -.if !empty(_last_dependfile) +# if not, just use TARGET_SPEC +_DEP_TARGET_SPEC := ${TARGET_SPEC} +.if ${.INCLUDEDFROMFILE:U:M${.MAKE.DEPENDFILE_PREFIX}*} != "" # record that we've read dependfile for this _dirdeps_checked.${_CURDIR}.${TARGET_SPEC}: .endif .endif # by now _DEP_TARGET_SPEC should be set, parse it. .if ${TARGET_SPEC_VARS:[#]} > 1 # we need to parse DEP_MACHINE may or may not contain more info _tspec := ${_DEP_TARGET_SPEC:S/,/ /g} .for i in ${_tspec_x} DEP_${TARGET_SPEC_VARS:[$i]} := ${_tspec:[$i]} .endfor .for v in ${TARGET_SPEC_VARS:O:u} .if empty(DEP_$v) .undef DEP_$v .endif .endfor .else DEP_MACHINE := ${_DEP_TARGET_SPEC} .endif # reset each time through _build_all_dirs = _build_xtra_dirs = # the first time we are included the _DIRDEP_USE target will not be defined # we can use this as a clue to do initialization and other one time things. .if !target(_DIRDEP_USE) # make sure this target exists dirdeps: beforedirdeps .WAIT beforedirdeps: # We normally expect to be included by Makefile.depend.* # which sets the DEP_* macros below. DEP_RELDIR ?= ${RELDIR} # this can cause lots of output! # set to a set of glob expressions that might match RELDIR DEBUG_DIRDEPS ?= no # remember the initial value of DEP_RELDIR - we test for it below. _DEP_RELDIR := ${DEP_RELDIR} .endif # DIRDEPS_CACHE can be very handy for debugging. # Also if repeatedly building the same target, # we can avoid the overhead of re-computing the tree dependencies. MK_DIRDEPS_CACHE ?= no BUILD_DIRDEPS_CACHE ?= no BUILD_DIRDEPS ?= yes .if ${MK_DIRDEPS_CACHE} == "yes" # this is where we will cache all our work DIRDEPS_CACHE ?= ${_OBJDIR:tA}/dirdeps.cache${_TARGETS:U${.TARGETS}:Nall:O:u:ts-:S,/,_,g:S,^,.,:N.} .endif .if ${DEBUG_DIRDEPS:@x@${DEP_RELDIR:M$x}${${DEP_RELDIR}.${DEP_MACHINE}:L:M$x}@} != "" _debug_reldir = 1 .else _debug_reldir = 0 .endif .if ${DEBUG_DIRDEPS:@x@${DEP_RELDIR:M$x}${${DEP_RELDIR}.depend:L:M$x}@} != "" _debug_search = 1 .else _debug_search = 0 .endif # pickup customizations # as below you can use !target(_DIRDEP_USE) to protect things # which should only be done once. .-include .if !target(_DIRDEP_USE) # things we skip for host tools SKIP_HOSTDIR ?= NSkipHostDir = ${SKIP_HOSTDIR:N*.host*:S,$,.host*,:N.host*:S,^,${SRCTOP}/,:${M_ListToSkip}} # things we always skip # SKIP_DIRDEPS allows for adding entries on command line. SKIP_DIR += .host *.WAIT ${SKIP_DIRDEPS} SKIP_DIR.host += ${SKIP_HOSTDIR} DEP_SKIP_DIR = ${SKIP_DIR} \ ${SKIP_DIR.${DEP_TARGET_SPEC}:U} \ ${TARGET_SPEC_VARS:@v@${SKIP_DIR.${DEP_$v}:U}@} \ ${SKIP_DIRDEPS.${DEP_TARGET_SPEC}:U} \ ${TARGET_SPEC_VARS:@v@${SKIP_DIRDEPS.${DEP_$v}:U}@} NSkipDir = ${DEP_SKIP_DIR:${M_ListToSkip}} .if defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS) NO_DIRDEPS = .elif defined(WITHOUT_DIRDEPS_BELOW) NO_DIRDEPS_BELOW = .endif .if defined(NO_DIRDEPS) # confine ourselves to the original dir and below. DIRDEPS_FILTER += M${_DEP_RELDIR}* .elif defined(NO_DIRDEPS_BELOW) DIRDEPS_FILTER += M${_DEP_RELDIR} .endif # this is what we run below DIRDEP_MAKE ?= ${.MAKE} DIRDEP_DIR ?= ${.TARGET:R} # if you want us to report load averages during build # DIRDEP_USE_PRELUDE += ${DIRDEP_LOADAVG_REPORT}; DIRDEP_LOADAVG_CMD ?= ${UPTIME:Uuptime} | sed 's,.*\(load\),\1,' DIRDEP_LOADAVG_LAST = 0 # yes the expression here is a bit complicated, # the trick is to only eval ${DIRDEP_LOADAVG_LAST::=${now_utc}} # when we want to report. DIRDEP_LOADAVG_REPORT = \ test -z "${"${expr ${now_utc} - ${DIRDEP_LOADAVG_INTEVAL:U60} - ${DIRDEP_LOADAVG_LAST}:L:sh:N-*}":?yes${DIRDEP_LOADAVG_LAST::=${now_utc}}:}" || \ echo "${TRACER}`${DIRDEP_LOADAVG_CMD}`" # we suppress SUBDIR when visiting the leaves # we assume sys.mk will set MACHINE_ARCH # you can add extras to DIRDEP_USE_ENV # if there is no makefile in the target directory, we skip it. _DIRDEP_USE: .USE .MAKE @for m in ${.MAKE.MAKEFILE_PREFERENCE}; do \ test -s ${.TARGET:R}/$$m || continue; \ echo "${TRACER}Checking ${.TARGET:S,${SRCTOP}/,,} for ${.TARGET:E} ..."; \ ${DIRDEP_USE_PRELUDE} \ MACHINE_ARCH= NO_SUBDIR=1 ${DIRDEP_USE_ENV} \ TARGET_SPEC=${.TARGET:E} \ MACHINE=${.TARGET:E} \ ${DIRDEP_MAKE} -C ${DIRDEP_DIR} || exit 1; \ break; \ done .ifdef ALL_MACHINES # this is how you limit it to only the machines we have been built for # previously. .if empty(ONLY_TARGET_SPEC_LIST) && empty(ONLY_MACHINE_LIST) .if !empty(ALL_MACHINE_LIST) # ALL_MACHINE_LIST is the list of all legal machines - ignore anything else _machine_list != cd ${_CURDIR} && 'ls' -1 ${ALL_MACHINE_LIST:O:u:@m@${.MAKE.DEPENDFILE:T:R}.$m@} 2> /dev/null; echo .else _machine_list != 'ls' -1 ${_CURDIR}/${.MAKE.DEPENDFILE_PREFIX}.* 2> /dev/null; echo .endif _only_machines := ${_machine_list:${NIgnoreFiles:UN*.bak}:E:O:u} .else _only_machines := ${ONLY_TARGET_SPEC_LIST:U} ${ONLY_MACHINE_LIST:U} .endif .if empty(_only_machines) # we must be boot-strapping _only_machines := ${TARGET_MACHINE:U${ALL_MACHINE_LIST:U${DEP_MACHINE}}} .endif .else # ! ALL_MACHINES # if ONLY_TARGET_SPEC_LIST or ONLY_MACHINE_LIST is set, we are limited to that. # Note that ONLY_TARGET_SPEC_LIST should be fully qualified. # if TARGET_MACHINE is set - it is really the same as ONLY_MACHINE_LIST # otherwise DEP_MACHINE is it - so DEP_MACHINE will match. _only_machines := ${ONLY_TARGET_SPEC_LIST:U:M${DEP_MACHINE},*} .if empty(_only_machines) _only_machines := ${ONLY_MACHINE_LIST:U${TARGET_MACHINE:U${DEP_MACHINE}}:M${DEP_MACHINE}} .endif .endif .if !empty(NOT_MACHINE_LIST) _only_machines := ${_only_machines:${NOT_MACHINE_LIST:${M_ListToSkip}}} .endif .if !empty(NOT_TARGET_SPEC_LIST) # we must first qualify _dm := ${DEP_MACHINE} _only_machines := ${_only_machines:M*,*} ${_only_machines:N*,*:@DEP_MACHINE@${DEP_TARGET_SPEC}@:S,^,.,:${M_dep_qual_fixes:ts:}:O:u:S,^.,,} DEP_MACHINE := ${_dm} _only_machines := ${_only_machines:${NOT_TARGET_SPEC_LIST:${M_ListToSkip}}} .endif # clean up _only_machines := ${_only_machines:O:u} # make sure we have a starting place? DIRDEPS ?= ${RELDIR} .endif # target .if !defined(NO_DIRDEPS) && !defined(NO_DIRDEPS_BELOW) .if ${MK_DIRDEPS_CACHE} == "yes" # just ensure this exists build-dirdeps: M_oneperline = @x@\\${.newline} $$x@ .if ${BUILD_DIRDEPS_CACHE} == "no" .if !target(dirdeps-cached) # we do this via sub-make BUILD_DIRDEPS = no # ignore anything but these .MAKE.META.IGNORE_FILTER = M*/${.MAKE.DEPENDFILE_PREFIX}* dirdeps: dirdeps-cached dirdeps-cached: ${DIRDEPS_CACHE} .MAKE @echo "${TRACER}Using ${DIRDEPS_CACHE}" @MAKELEVEL=${.MAKE.LEVEL} ${.MAKE} -C ${_CURDIR} -f ${DIRDEPS_CACHE} \ dirdeps MK_DIRDEPS_CACHE=no BUILD_DIRDEPS=no # leaf makefiles rarely work for building DIRDEPS_CACHE .if ${RELDIR} != "." BUILD_DIRDEPS_MAKEFILE ?= -f dirdeps.mk .endif # these should generally do BUILD_DIRDEPS_MAKEFILE ?= BUILD_DIRDEPS_TARGETS ?= ${.TARGETS} .if ${DIRDEPS_CACHE} != ${STATIC_DIRDEPS_CACHE:Uno} && ${DIRDEPS_CACHE:M${SRCTOP}/*} == "" # export this for dirdeps-cache-update.mk DYNAMIC_DIRDEPS_CACHE := ${DIRDEPS_CACHE} .export DYNAMIC_DIRDEPS_CACHE # we need the .meta file to ensure we update if # any of the Makefile.depend* changed. # We do not want to compare the command line though. ${DIRDEPS_CACHE}: .META .NOMETA_CMP +@{ echo '# Autogenerated - do NOT edit!'; echo; \ echo 'BUILD_DIRDEPS=no'; echo; \ echo '.include '; echo; \ } > ${.TARGET}.new +@MAKELEVEL=${.MAKE.LEVEL} DIRDEPS_CACHE=${DIRDEPS_CACHE} \ DIRDEPS="${DIRDEPS}" \ TARGET_SPEC=${TARGET_SPEC} \ MAKEFLAGS= ${DIRDEP_CACHE_MAKE:U${.MAKE}} -C ${_CURDIR} \ ${BUILD_DIRDEPS_MAKEFILE} \ ${BUILD_DIRDEPS_TARGETS} BUILD_DIRDEPS_CACHE=yes \ .MAKE.DEPENDFILE=.none \ ${"${DEBUG_DIRDEPS:Nno}":?DEBUG_DIRDEPS='${DEBUG_DIRDEPS}':} \ ${.MAKEFLAGS:tW:S,-D ,-D,g:tw:M*WITH*} \ ${.MAKEFLAGS:tW:S,-d ,-d,g:tw:M-d*} \ 3>&1 1>&2 | sed 's,${SRCTOP},$${SRCTOP},g;s,_{,$${,g' >> ${.TARGET}.new && \ mv ${.TARGET}.new ${.TARGET} .endif .endif .elif !target(_count_dirdeps) # we want to capture the dirdeps count in the cache .END: _count_dirdeps _count_dirdeps: .NOMETA @{ echo; echo '.info $${.newline}$${TRACER}Makefiles read: total=${.MAKE.MAKEFILES:[#]} depend=${.MAKE.MAKEFILES:M*depend*:[#]} dirdeps=${.ALLTARGETS:M${SRCTOP}*:O:u:[#]} ${DIRDEP_INFO_XTRAS}'; } >&3 .endif .elif !make(dirdeps) && !target(_count_dirdeps) beforedirdeps: _count_dirdeps _count_dirdeps: .NOMETA @echo "${TRACER}Makefiles read: total=${.MAKE.MAKEFILES:[#]} depend=${.MAKE.MAKEFILES:M*depend*:[#]} dirdeps=${.ALLTARGETS:M${SRCTOP}*:O:u:[#]} ${DIRDEP_INFO_XTRAS} seconds=`expr ${now_utc} - ${start_utc}`" .endif .endif .if ${BUILD_DIRDEPS} == "yes" # the rest is done repeatedly for every Makefile.depend we read. # if we are anything but the original dir we care only about the # machine type we were included for.. .if ${DEP_RELDIR} == "." _this_dir := ${SRCTOP} .else _this_dir := ${SRCTOP}/${DEP_RELDIR} .endif # on rare occasions, there can be a need for extra help _dep_hack := ${_this_dir}/${.MAKE.DEPENDFILE_PREFIX}.inc .-include <${_dep_hack}> .-include <${_dep_hack:R}.options> .if ${DEP_RELDIR} != ${_DEP_RELDIR} || ${DEP_TARGET_SPEC} != ${TARGET_SPEC} # this should be all _machines := ${DEP_MACHINE} .else # this is the machine list we actually use below _machines := ${_only_machines} .if defined(HOSTPROG) || ${DEP_MACHINE:Nhost*} == "" # we need to build this guy's dependencies for host as well. .if ${DEP_MACHINE:Nhost*} == "" _machines += ${DEP_MACHINE} .else _machines += host .endif .endif _machines := ${_machines:O:u} .endif .if ${TARGET_SPEC_VARS:[#]} > 1 # we need to tweak _machines _dm := ${DEP_MACHINE} # apply the same filtering that we do when qualifying DIRDEPS. # M_dep_qual_fixes expects .${MACHINE}* so add (and remove) '.' # Again we expect that any already qualified machines are fully qualified. _machines := ${_machines:M*,*} ${_machines:N*,*:@DEP_MACHINE@${DEP_TARGET_SPEC}@:S,^,.,:${M_dep_qual_fixes:ts:}:O:u:S,^.,,} DEP_MACHINE := ${_dm} _machines := ${_machines:O:u} .endif # reset each time through _build_dirs = .if ${DEP_RELDIR} == ${_DEP_RELDIR} # pickup other machines for this dir if necessary _build_dirs += ${_machines:@m@${_CURDIR}.$m@} .endif .if ${_debug_reldir} .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: DIRDEPS='${DIRDEPS}' .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: _machines='${_machines}' .endif .if !empty(DIRDEPS) # these we reset each time through as they can depend on DEP_MACHINE DEP_DIRDEPS_FILTER = \ ${DIRDEPS_FILTER.${DEP_TARGET_SPEC}:U} \ ${TARGET_SPEC_VARS:@v@${DIRDEPS_FILTER.${DEP_$v}:U}@} \ ${DIRDEPS_FILTER:U} .if empty(DEP_DIRDEPS_FILTER) # something harmless DEP_DIRDEPS_FILTER = U .endif # this is what we start with __depdirs := ${DIRDEPS:${NSkipDir}:${DEP_DIRDEPS_FILTER:ts:}:C,//+,/,g:O:u:@d@${SRCTOP}/$d@} # some entries may be qualified with . # the :M*/*/*.* just tries to limit the dirs we check to likely ones. # the ${d:E:M*/*} ensures we don't consider junos/usr.sbin/mgd __qual_depdirs := ${__depdirs:M*/*/*.*:@d@${exists($d):?:${"${d:E:M*/*}":?:${exists(${d:R}):?$d:}}}@} __unqual_depdirs := ${__depdirs:${__qual_depdirs:Uno:${M_ListToSkip}}} .if ${DEP_RELDIR} == ${_DEP_RELDIR} # if it was called out - we likely need it. __hostdpadd := ${DPADD:U.:M${HOST_OBJTOP}/*:S,${HOST_OBJTOP}/,,:H:${NSkipDir}:${DIRDEPS_FILTER:ts:}:S,$,.host,:N.*:@d@${SRCTOP}/$d@} \ ${DPADD:U.:M${HOST_OBJTOP32:Uno}/*:S,${HOST_OBJTOP32:Uno}/,,:H:${NSkipDir}:${DIRDEPS_FILTER:ts:}:S,$,.host32,:N.*:@d@${SRCTOP}/$d@} __qual_depdirs += ${__hostdpadd} .endif .if ${_debug_reldir} .info DEP_DIRDEPS_FILTER=${DEP_DIRDEPS_FILTER:ts:} .info depdirs=${__depdirs} .info qualified=${__qual_depdirs} .info unqualified=${__unqual_depdirs} .endif # _build_dirs is what we will feed to _DIRDEP_USE _build_dirs += \ ${__qual_depdirs:M*.host:${NSkipHostDir}:N.host} \ ${__qual_depdirs:N*.host} \ ${_machines:Mhost*:@m@${__unqual_depdirs:@d@$d.$m@}@:${NSkipHostDir}:N.host} \ ${_machines:Nhost*:@m@${__unqual_depdirs:@d@$d.$m@}@} # qualify everything now _build_dirs := ${_build_dirs:${M_dep_qual_fixes:ts:}:O:u} .endif # empty DIRDEPS _build_all_dirs += ${_build_dirs} ${_build_xtra_dirs} _build_all_dirs := ${_build_all_dirs:O:u} # Normally if doing make -V something, # we do not want to waste time chasing DIRDEPS # but if we want to count the number of Makefile.depend* read, we do. .if ${.MAKEFLAGS:M-V${_V_READ_DIRDEPS}} == "" .if !empty(_build_all_dirs) .if ${BUILD_DIRDEPS_CACHE} == "yes" x!= echo; { echo; echo '\# ${DEP_RELDIR}.${DEP_TARGET_SPEC}'; } >&3 # guard against _new_dirdeps being too big for a single command line _new_dirdeps := ${_build_all_dirs:@x@${target($x):?:$x}@} .export _build_xtra_dirs _new_dirdeps .if !empty(DEP_EXPORT_VARS) # Discouraged, but there are always exceptions. # Handle it here rather than explain how. x!= echo; { echo; ${DEP_EXPORT_VARS:@v@echo '$v=${$v}';@} echo '.export ${DEP_EXPORT_VARS}'; echo; } >&3 .endif .else # this makes it all happen dirdeps: ${_build_all_dirs} .endif ${_build_all_dirs}: _DIRDEP_USE .if ${_debug_reldir} .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: needs: ${_build_dirs} .endif .if !empty(DEP_EXPORT_VARS) .export ${DEP_EXPORT_VARS} DEP_EXPORT_VARS= .endif # this builds the dependency graph .for m in ${_machines} .if ${BUILD_DIRDEPS_CACHE} == "yes" && !empty(_build_dirs) x!= echo; { echo; echo 'DIRDEPS.${_this_dir}.$m = \'; } >&3 _cache_deps = .endif # it would be nice to do :N${.TARGET} .if !empty(__qual_depdirs) .for q in ${__qual_depdirs:${M_dep_qual_fixes:ts:}:E:O:u:N$m} .if ${_debug_reldir} || ${DEBUG_DIRDEPS:@x@${${DEP_RELDIR}.$m:L:M$x}${${DEP_RELDIR}.$q:L:M$x}@} != "" .info ${DEP_RELDIR}.$m: graph: ${_build_dirs:M*.$q} .endif .if ${BUILD_DIRDEPS_CACHE} == "yes" _cache_deps += ${_build_dirs:M*.$q} .else ${_this_dir}.$m: ${_build_dirs:M*.$q} .endif .endfor .endif .if ${_debug_reldir} .info ${DEP_RELDIR}.$m: graph: ${_build_dirs:M*.$m:N${_this_dir}.$m} .endif .if ${BUILD_DIRDEPS_CACHE} == "yes" .if !empty(_build_dirs) _cache_deps += ${_build_dirs:M*.$m:N${_this_dir}.$m} .if !empty(_cache_deps) .export _cache_deps x!= echo; for x in $$_cache_deps; do echo " $$x \\"; done >&3 .endif x!= echo; { echo; echo '${_this_dir}.$m: $${DIRDEPS.${_this_dir}.$m}'; \ echo; echo 'dirdeps: ${_this_dir}.$m \'; \ for x in $$_build_xtra_dirs; do echo " $$x \\"; done; \ echo; for x in $$_new_dirdeps; do echo "$$x: _DIRDEP_USE"; done; } >&3 .endif .else ${_this_dir}.$m: ${_build_dirs:M*.$m:N${_this_dir}.$m} .endif .endfor .endif # Now find more dependencies - and recurse. .for d in ${_build_all_dirs} .if !target(_dirdeps_checked.$d) # once only _dirdeps_checked.$d: .if ${_debug_search} .info checking $d .endif # Note: _build_all_dirs is fully qualifed so d:R is always the directory .if exists(${d:R}) # we pass _DEP_TARGET_SPEC to tell the next step what we want _DEP_TARGET_SPEC := ${d:E} # some makefiles may still look at this _DEP_MACHINE := ${d:E:C/,.*//} # set these too in case Makefile.depend* uses them .if ${TARGET_SPEC_VARS:[#]} > 1 _dtspec := ${_DEP_TARGET_SPEC:S/,/ /g} .for i in ${_tspec_x} DEP_${TARGET_SPEC_VARS:[$i]} := ${_dtspec:[$i]} .endfor .else DEP_MACHINE := ${_DEP_MACHINE} .endif # Warning: there is an assumption here that MACHINE is always # the first entry in TARGET_SPEC_VARS. # If TARGET_SPEC and MACHINE are insufficient, you have a problem. _m := ${.MAKE.DEPENDFILE_PREFERENCE:T:S;${TARGET_SPEC}$;${d:E};:S;${MACHINE};${d:E:C/,.*//};:@m@${exists(${d:R}/$m):?${d:R}/$m:}@:[1]} .if !empty(_m) # M_dep_qual_fixes isn't geared to Makefile.depend _qm := ${_m:C;(\.depend)$;\1.${d:E};:${M_dep_qual_fixes:ts:}} .if ${_debug_search} .info Looking for ${_qm} .endif # set this "just in case" # we can skip :tA since we computed the path above DEP_RELDIR := ${_m:H:S,${SRCTOP}/,,} # and reset this DIRDEPS = .if ${_debug_reldir} && ${_qm} != ${_m} .info loading ${_m} for ${d:E} .endif .include <${_m}> .else .-include .endif .endif .endif .endfor .endif # -V .endif # BUILD_DIRDEPS .elif ${.MAKE.LEVEL} > 42 .error You should have stopped recursing by now. .else # we are building something DEP_RELDIR := ${RELDIR} _DEP_RELDIR := ${RELDIR} # Since we are/should be included by .MAKE.DEPENDFILE # This is a final opportunity to add/hook global rules. .-include # skip _reldir_{finish,failed} if not included from Makefile.depend* # or not in meta mode .if !defined(WITHOUT_META_STATS) && ${.INCLUDEDFROMFILE:U:M${.MAKE.DEPENDFILE_PREFIX}*} != "" && ${.MAKE.MODE:Mmeta} != "" meta_stats= meta=${empty(.MAKE.META.FILES):?0:${.MAKE.META.FILES:[#]}} \ created=${empty(.MAKE.META.CREATED):?0:${.MAKE.META.CREATED:[#]}} .if !target(_reldir_finish) .END: _reldir_finish _reldir_finish: .NOMETA @echo "${TRACER}Finished ${RELDIR}.${TARGET_SPEC} seconds=$$(( ${now_utc} - ${start_utc} )) ${meta_stats}" .endif .if !target(_reldir_failed) .ERROR: _reldir_failed _reldir_failed: .NOMETA @echo "${TRACER}Failed ${RELDIR}.${TARGET_SPEC} seconds=$$(( ${now_utc} - ${start_utc} )) ${meta_stats}" .endif .endif # pickup local dependencies .if ${MAKE_VERSION} < 20160220 .-include <.depend> .else .dinclude <.depend> .endif .endif # bootstrapping new dependencies made easy? .if !target(bootstrap) && (make(bootstrap) || \ make(bootstrap-this) || \ make(bootstrap-recurse) || \ make(bootstrap-empty)) # if we are bootstrapping create the default _want = ${.CURDIR}/${.MAKE.DEPENDFILE_DEFAULT:T} .if exists(${_want}) # stop here ${.TARGETS:Mboot*}: .elif !make(bootstrap-empty) # find a Makefile.depend to use as _src _src != cd ${.CURDIR} && for m in ${.MAKE.DEPENDFILE_PREFERENCE:T:S,${MACHINE},*,}; do test -s $$m || continue; echo $$m; break; done; echo .if empty(_src) .error cannot find any of ${.MAKE.DEPENDFILE_PREFERENCE:T}${.newline}Use: bootstrap-empty .endif _src?= ${.MAKE.DEPENDFILE} .MAKE.DEPENDFILE_BOOTSTRAP_SED+= -e 's/${_src:E:C/,.*//}/${MACHINE}/g' # just create Makefile.depend* for this dir bootstrap-this: .NOTMAIN @echo Bootstrapping ${RELDIR}/${_want:T} from ${_src:T}; \ echo You need to build ${RELDIR} to correctly populate it. .if ${_src:T} != ${.MAKE.DEPENDFILE_PREFIX:T} (cd ${.CURDIR} && sed ${.MAKE.DEPENDFILE_BOOTSTRAP_SED} ${_src} > ${_want:T}) .else cp ${.CURDIR}/${_src:T} ${_want} .endif # create Makefile.depend* for this dir and its dependencies bootstrap: bootstrap-recurse bootstrap-recurse: bootstrap-this _mf := ${.PARSEFILE} bootstrap-recurse: .NOTMAIN .MAKE @cd ${SRCTOP} && \ for d in `cd ${RELDIR} && ${.MAKE} -B -f ${"${.MAKEFLAGS:M-n}":?${_src}:${.MAKE.DEPENDFILE:T}} -V DIRDEPS`; do \ test -d $$d || d=$${d%.*}; \ test -d $$d || continue; \ echo "Checking $$d for bootstrap ..."; \ (cd $$d && ${.MAKE} -f ${_mf} bootstrap-recurse); \ done .endif # create an empty Makefile.depend* to get the ball rolling. bootstrap-empty: .NOTMAIN .NOMETA @echo Creating empty ${RELDIR}/${_want:T}; \ echo You need to build ${RELDIR} to correctly populate it. @{ echo DIRDEPS=; echo ".include "; } > ${_want} .endif diff --git a/mk/init.mk b/mk/init.mk index 0dae997beb54..8f6f8f2fbaf4 100644 --- a/mk/init.mk +++ b/mk/init.mk @@ -1,93 +1,96 @@ -# $Id: init.mk,v 1.21 2020/08/19 17:51:53 sjg Exp $ +# $Id: init.mk,v 1.25 2020/11/27 17:59:46 sjg Exp $ # # @(#) Copyright (c) 2002, Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise # use this file is hereby granted provided that # the above copyright notice and this notice are # left intact. # # Please send copies of changes and bug-fixes to: # sjg@crufty.net # .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: .if ${MAKE_VERSION:U0} > 20100408 _this_mk_dir := ${.PARSEDIR:tA} .else _this_mk_dir := ${.PARSEDIR} .endif .-include .-include <${.CURDIR:H}/Makefile.inc> .include .include .MAIN: all # should have been set by sys.mk CXX_SUFFIXES?= .cc .cpp .cxx .C .if !empty(WARNINGS_SET) || !empty(WARNINGS_SET_${MACHINE_ARCH}) .include .endif # these are applied in order, least specific to most VAR_QUALIFIER_LIST += \ ${TARGET_SPEC_VARS:UMACHINE:@v@${$v}@} \ ${COMPILER_TYPE} \ ${.TARGET:T:R} \ ${.TARGET:T} \ ${.IMPSRC:T} \ ${VAR_QUALIFIER_XTRA_LIST} QUALIFIED_VAR_LIST += \ CFLAGS \ COPTS \ CPPFLAGS \ CPUFLAGS \ LDFLAGS \ # a final :U avoids errors if someone uses := .for V in ${QUALIFIED_VAR_LIST:O:u:@q@$q $q_LAST@} .for Q in ${VAR_QUALIFIER_LIST:u} $V += ${$V.$Q:U} ${$V.$Q.${COMPILER_TYPE}:U} .endfor .endfor CC_PG?= -pg CXX_PG?= ${CC_PG} CC_PIC?= -DPIC CXX_PIC?= ${CC_PIC} PROFFLAGS?= -DGPROF -DPROF -# targets that are ok at level 0 -LEVEL0_TARGETS += clean* destory* -M_ListToSkip= O:u:S,^,N,:ts: - -.if ${.MAKE.LEVEL:U1} == 0 && ${MK_DIRDEPS_BUILD:Uno} == "yes" && ${.TARGETS:Uall:${LEVEL0_TARGETS:${M_ListToSkip}}} != "" +.if ${.MAKE.LEVEL:U1} == 0 && ${MK_DIRDEPS_BUILD:Uno} == "yes" +# targets that are ok at level 0 +DIRDEPS_BUILD_LEVEL0_TARGETS += clean* destroy* +M_ListToSkip?= O:u:S,^,N,:ts: +.if ${.TARGETS:Uall:${DIRDEPS_BUILD_LEVEL0_TARGETS:${M_ListToSkip}}} != "" # this tells lib.mk and prog.mk to not actually build anything _SKIP_BUILD = not building at level 0 .endif +.endif .if !defined(.PARSEDIR) # no-op is the best we can do if not bmake. .WAIT: .endif # define this once for consistency -.if empty(_SKIP_BUILD) +.if !defined(_SKIP_BUILD) # beforebuild is a hook for things that must be done early all: beforebuild .WAIT realbuild .else all: .PHONY +.if !empty(_SKIP_BUILD) && ${.MAKEFLAGS:M-V} == "" .warning ${_SKIP_BUILD} .endif +.endif beforebuild: realbuild: .endif diff --git a/mk/install-mk b/mk/install-mk old mode 100644 new mode 100755 index cd396f7d5331..aa3f360b43ae --- a/mk/install-mk +++ b/mk/install-mk @@ -1,185 +1,185 @@ : # NAME: # install-mk - install mk files # # SYNOPSIS: # install-mk [options] [var=val] [dest] # # DESCRIPTION: # This tool installs mk files in a semi-intelligent manner into # "dest". # # Options: # # -n just say what we want to do, but don't touch anything. # # -f use -f when copying sys,mk. # # -v be verbose # # -q be quiet # # -m "mode" # Use "mode" for installed files (444). # # -o "owner" # Use "owner" for installed files. # # -g "group" # Use "group" for installed files. # # var=val # Set "var" to "val". See below. # # All our *.mk files are copied to "dest" with appropriate # ownership and permissions. # # By default if a sys.mk can be found in a standard location # (that bmake will find) then no sys.mk will be put in "dest". # # SKIP_SYS_MK: # If set, we will avoid installing our 'sys.mk' # This is probably a bad idea. # # SKIP_BSD_MK: # If set, we will skip making bsd.*.mk links to *.mk # # sys.mk: # # By default (and provided we are not installing to the system # mk dir - '/usr/share/mk') we install our own 'sys.mk' which # includes a sys specific file, or a generic one. # # # AUTHOR: # Simon J. Gerraty # RCSid: -# $Id: install-mk,v 1.184 2020/11/08 05:47:56 sjg Exp $ +# $Id: install-mk,v 1.190 2021/01/07 00:58:42 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise # use this file is hereby granted provided that # the above copyright notice and this notice are # left intact. # # Please send copies of changes and bug-fixes to: # sjg@crufty.net # -MK_VERSION=20201106 +MK_VERSION=20210101 OWNER= GROUP= MODE=444 BINMODE=555 ECHO=: SKIP= cp_f=-f while : do case "$1" in *=*) eval "$1"; shift;; +f) cp_f=; shift;; -f) cp_f=-f; shift;; -m) MODE=$2; shift 2;; -o) OWNER=$2; shift 2;; -g) GROUP=$2; shift 2;; -v) ECHO=echo; shift;; -q) ECHO=:; shift;; -n) ECHO=echo SKIP=:; shift;; --) shift; break;; *) break;; esac done case $# in 0) echo "$0 [options] []" echo "eg." echo "$0 -o bin -g bin -m 444 /usr/local/share/mk" exit 1 ;; esac dest=$1 os=${2:-`uname`} osrel=${3:-`uname -r`} Do() { $ECHO "$@" $SKIP "$@" } Error() { echo "ERROR: $@" >&2 exit 1 } Warning() { echo "WARNING: $@" >&2 } [ "$FORCE_SYS_MK" ] && Warning "ignoring: FORCE_{BSD,SYS}_MK (no longer supported)" SYS_MK_DIR=${SYS_MK_DIR:-/usr/share/mk} SYS_MK=${SYS_MK:-$SYS_MK_DIR/sys.mk} realpath() { [ -d $1 ] && cd $1 && 'pwd' && return echo $1 } if [ -s $SYS_MK -a -d $dest ]; then # if this is a BSD system we don't want to touch $SYS_MK dest=`realpath $dest` sys_mk_dir=`realpath $SYS_MK_DIR` if [ $dest = $sys_mk_dir ]; then case "$os" in *BSD*) SKIP_SYS_MK=: SKIP_BSD_MK=: ;; *) # could be fake? if [ ! -d $dest/sys -a ! -s $dest/Generic.sys.mk ]; then SKIP_SYS_MK=: # play safe SKIP_BSD_MK=: fi ;; esac fi fi [ -d $dest/sys ] || Do mkdir -p $dest/sys [ -d $dest/sys ] || Do mkdir $dest/sys || exit 1 [ -z "$SKIP" ] && dest=`realpath $dest` cd `dirname $0` mksrc=`'pwd'` if [ $mksrc = $dest ]; then SKIP_MKFILES=: else # we do not install the examples mk_files=`grep '^[a-z].*\.mk' FILES | egrep -v '(examples/|^sys\.mk|sys/)'` mk_scripts=`egrep '^[a-z].*\.(sh|py)' FILES | egrep -v '/'` sys_mk_files=`grep 'sys/.*\.mk' FILES` SKIP_MKFILES= [ -z "$SKIP_SYS_MK" ] && mk_files="sys.mk $mk_files" fi $SKIP_MKFILES Do cp $cp_f $mk_files $dest $SKIP_MKFILES Do cp $cp_f $sys_mk_files $dest/sys $SKIP_MKFILES Do cp $cp_f $mk_scripts $dest $SKIP cd $dest $SKIP_MKFILES Do chmod $MODE $mk_files $sys_mk_files $SKIP_MKFILES Do chmod $BINMODE $mk_scripts [ "$GROUP" ] && $SKIP_MKFILES Do chgrp $GROUP $mk_files $sys_mk_files [ "$OWNER" ] && $SKIP_MKFILES Do chown $OWNER $mk_files $sys_mk_files # if this is a BSD system the bsd.*.mk should exist and be used. if [ -z "$SKIP_BSD_MK" ]; then for f in dep doc files inc init lib links man nls obj own prog subdir do b=bsd.$f.mk [ -s $b ] || Do ln -s $f.mk $b done fi exit 0 diff --git a/mk/meta.subdir.mk b/mk/meta.subdir.mk index 39cf875d6b77..d9caae4edbcc 100644 --- a/mk/meta.subdir.mk +++ b/mk/meta.subdir.mk @@ -1,79 +1,79 @@ -# $Id: meta.subdir.mk,v 1.12 2020/08/19 17:51:53 sjg Exp $ +# $Id: meta.subdir.mk,v 1.13 2021/01/05 22:24:37 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise # use this file is hereby granted provided that # the above copyright notice and this notice are # left intact. # # Please send copies of changes and bug-fixes to: # sjg@crufty.net # .if !defined(NO_SUBDIR) && !empty(SUBDIR) .if make(destroy*) || make(clean*) .MAKE.MODE = compat -.if !commands(destroy) +.if !commands(obj) .-include .endif .elif ${.MAKE.LEVEL} == 0 .MAIN: all .if !exists(${.CURDIR}/${.MAKE.DEPENDFILE:T}) || make(gendirdeps) # start with this DIRDEPS = ${SUBDIR:N.WAIT:O:u:@d@${RELDIR}/$d@} .if make(gendirdeps) .include .else # this is the cunning bit # actually it is probably a bit risky # since we may pickup subdirs which are not relevant # the alternative is a walk through the tree though # which is difficult without a sub-make. .if defined(BOOTSTRAP_DEPENDFILES) _find_name = ${.MAKE.MAKEFILE_PREFERENCE:@m@-o -name $m@:S,^-o,,1} DIRDEPS = ${_subdeps:H:O:u:@d@${RELDIR}/$d@} .elif ${.MAKE.DEPENDFILE:E} == ${MACHINE} && defined(ALL_MACHINES) # we want to find Makefile.depend.* ie for all machines # and turn the dirs into dir. _find_name = -name '${.MAKE.DEPENDFILE:T:R}*' DIRDEPS = ${_subdeps:O:u:${NIgnoreFiles}:@d@${RELDIR}/${d:H}.${d:E}@:S,.${MACHINE}$,,:S,.depend$,,} .else # much simpler _find_name = -name ${.MAKE.DEPENDFILE:T} .if ${.MAKE.DEPENDFILE:E} == ${MACHINE} _find_name += -o -name ${.MAKE.DEPENDFILE:T:R} .endif DIRDEPS = ${_subdeps:H:O:u:@d@${RELDIR}/$d@} .endif _subdeps != cd ${.CURDIR} && \ find ${SUBDIR:N.WAIT} -type f \( ${_find_name} \) -print -o \ -name .svn -prune 2> /dev/null; echo .if empty(_subdeps) DIRDEPS = .else # clean up if needed DIRDEPS := ${DIRDEPS:S,^./,,:S,/./,/,g:${SUBDIRDEPS_FILTER:Uu}} .endif # we just dealt with it, if we leave it defined, # dirdeps.mk will compute some interesting combinations. .undef ALL_MACHINES DEP_RELDIR = ${RELDIR} .include .endif .endif .else all: .PHONY .endif .endif diff --git a/mk/mkopt.sh b/mk/mkopt.sh old mode 100755 new mode 100644 diff --git a/mk/own.mk b/mk/own.mk index b20b9e5e2c35..63322297420b 100644 --- a/mk/own.mk +++ b/mk/own.mk @@ -1,271 +1,271 @@ -# $Id: own.mk,v 1.41 2020/08/19 17:51:53 sjg Exp $ +# $Id: own.mk,v 1.42 2020/11/27 18:00:08 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: .if !target(__init.mk__) .include "init.mk" .endif .if !defined(NOMAKECONF) && !defined(NO_MAKECONF) MAKECONF?= /etc/mk.conf .-include "${MAKECONF}" .endif .include TARGET_OSNAME?= ${_HOST_OSNAME} TARGET_OSREL?= ${_HOST_OSREL} TARGET_OSTYPE?= ${HOST_OSTYPE} TARGET_HOST?= ${HOST_TARGET} # these may or may not exist .-include <${TARGET_HOST}.mk> .-include RM?= rm LN?= ln INSTALL?= install prefix?= /usr .if exists(${prefix}/lib) libprefix?= ${prefix} .else libprefix?= /usr .endif # FreeBSD at least does not set this MACHINE_ARCH?= ${MACHINE} # we need to make sure these are defined too in case sys.mk fails to. COMPILE.s?= ${CC} ${AFLAGS} -c LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS} COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS} COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} CXXFLAGS?= ${CFLAGS} COMPILE.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS} COMPILE.f?= ${FC} ${FFLAGS} -c LINK.f?= ${FC} ${FFLAGS} ${LDFLAGS} COMPILE.F?= ${FC} ${FFLAGS} ${CPPFLAGS} -c LINK.F?= ${FC} ${FFLAGS} ${CPPFLAGS} ${LDFLAGS} COMPILE.r?= ${FC} ${FFLAGS} ${RFLAGS} -c LINK.r?= ${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS} LEX.l?= ${LEX} ${LFLAGS} COMPILE.p?= ${PC} ${PFLAGS} ${CPPFLAGS} -c LINK.p?= ${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS} YACC.y?= ${YACC} ${YFLAGS} # for suffix rules IMPFLAGS?= ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} .for s in .c .cc COMPILE.$s += ${IMPFLAGS} LINK.$s += ${IMPFLAGS} .endfor PRINT.VAR.MAKE = MAKESYSPATH=${MAKESYSPATH:U${.PARSEDIR}} ${.MAKE} .if empty(.MAKEFLAGS:M-V*) .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR) PRINTOBJDIR= ${PRINT.VAR.MAKE} -r -V .OBJDIR -f /dev/null xxx .else PRINTOBJDIR= ${PRINT.VAR.MAKE} -V .OBJDIR .endif .else PRINTOBJDIR= echo # prevent infinite recursion .endif # we really like to have SRCTOP and OBJTOP defined... .if !defined(SRCTOP) || !defined(OBJTOP) .-include .endif .if !defined(SRCTOP) || !defined(OBJTOP) # dpadd.mk is rather pointless without these OPTIONS_DEFAULT_NO+= DPADD_MK .endif # process options OPTIONS_DEFAULT_NO+= \ INSTALL_AS_USER \ GPROF \ PROG_LDORDER_MK \ LIBTOOL \ LINT \ OPTIONS_DEFAULT_YES+= \ ARCHIVE \ AUTODEP \ CRYPTO \ DOC \ DPADD_MK \ GDB \ KERBEROS \ LINKLIB \ MAN \ NLS \ OBJ \ PIC \ SHARE \ SKEY \ YP \ OPTIONS_DEFAULT_DEPENDENT+= \ CATPAGES/MAN \ LDORDER_MK/PROG_LDORDER_MK \ OBJDIRS/OBJ \ PICINSTALL/LINKLIB \ PICLIB/PIC \ PROFILE/LINKLIB \ STAGING_PROG/STAGING \ .include .if ${MK_INSTALL_AS_USER} == "yes" # We ignore this if user is root. -_uid!= id -u +_uid:= ${.MAKE.UID:U${id -u:L:sh}} .if ${_uid} != 0 .if !defined(USERGRP) -USERGRP!= id -g +USERGRP:= ${.MAKE.GID:U${id -g:L:sh}} .export USERGRP .endif .for x in BIN CONF DOC INC INFO FILES KMOD LIB MAN NLS PROG SHARE $xOWN= ${USER} $xGRP= ${USERGRP} $x_INSTALL_OWN= .endfor .endif .endif # override this in sys.mk ROOT_GROUP?= wheel BINGRP?= ${ROOT_GROUP} BINOWN?= root BINMODE?= 555 NONBINMODE?= 444 DIRMODE?= 755 INCLUDEDIR?= ${prefix}/include INCDIR?= ${INCLUDEDIR} # Define MANZ to have the man pages compressed (gzip) #MANZ= 1 MANTARGET?= cat MANDIR?= ${prefix}/share/man/${MANTARGET} MANGRP?= ${BINGRP} MANOWN?= ${BINOWN} MANMODE?= ${NONBINMODE} INCLUDEDIR?= ${libprefix}/include LIBDIR?= ${libprefix}/lib SHLIBDIR?= ${libprefix}/lib .if ${USE_SHLIBDIR:Uno} == "yes" _LIBSODIR?= ${SHLIBDIR} .else _LIBSODIR?= ${LIBDIR} .endif # this is where ld.*so lives SHLINKDIR?= /usr/libexec LINTLIBDIR?= ${libprefix}/libdata/lint LIBGRP?= ${BINGRP} LIBOWN?= ${BINOWN} LIBMODE?= ${NONBINMODE} DOCDIR?= ${prefix}/share/doc DOCGRP?= ${BINGRP} DOCOWN?= ${BINOWN} DOCMODE?= ${NONBINMODE} NLSDIR?= ${prefix}/share/nls NLSGRP?= ${BINGRP} NLSOWN?= ${BINOWN} NLSMODE?= ${NONBINMODE} KMODDIR?= ${prefix}/lkm KMODGRP?= ${BINGRP} KMODOWN?= ${BINOWN} KMODMODE?= ${NONBINMODE} SHAREGRP?= ${BINGRP} SHAREOWN?= ${BINOWN} SHAREMODE?= ${NONBINMODE} COPY?= -c STRIP_FLAG?= -s .if ${TARGET_OSNAME} == "NetBSD" .if exists(/usr/libexec/ld.elf_so) OBJECT_FMT=ELF .endif OBJECT_FMT?=a.out .endif # sys.mk should set something appropriate if need be. OBJECT_FMT?=ELF .if (${_HOST_OSNAME} == "FreeBSD") CFLAGS+= ${CPPFLAGS} .endif # allow for per target flags # apply the :T:R first, so the more specific :T can override if needed CPPFLAGS += ${CPPFLAGS_${.TARGET:T:R}} ${CPPFLAGS_${.TARGET:T}} CFLAGS += ${CFLAGS_${.TARGET:T:R}} ${CFLAGS_${.TARGET:T}} # Define SYS_INCLUDE to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''); (latter useful # in environments where it's not possible to keep /sys publicly readable) #SYS_INCLUDE= symlinks # don't try to generate PIC versions of libraries on machines # which don't support PIC. .if (${MACHINE_ARCH} == "vax") || \ ((${MACHINE_ARCH} == "mips") && defined(STATIC_TOOLCHAIN)) || \ ((${MACHINE_ARCH} == "alpha") && defined(ECOFF_TOOLCHAIN)) MK_PIC=no .endif # No lint, for now. NOLINT= .if ${MK_LINKLIB} == "no" MK_PICINSTALL= no MK_PROFILE= no .endif .if ${MK_MAN} == "no" MK_CATPAGES= no .endif .if ${MK_OBJ} == "no" MK_OBJDIRS= no MK_AUTO_OBJ= no .endif .if ${MK_SHARE} == "no" MK_CATPAGES= no MK_DOC= no MK_INFO= no MK_MAN= no MK_NLS= no .endif # :U incase not using our sys.mk .if ${MK_META_MODE:Uno} == "yes" # should all be set by sys.mk if not default TARGET_SPEC_VARS ?= MACHINE .if ${TARGET_SPEC_VARS:[#]} > 1 TARGET_SPEC_VARS_REV := ${TARGET_SPEC_VARS:[-1..1]} .else TARGET_SPEC_VARS_REV = ${TARGET_SPEC_VARS} .endif .if ${MK_STAGING} == "yes" STAGE_ROOT?= ${OBJROOT}/stage STAGE_OBJTOP?= ${STAGE_ROOT}/${TARGET_SPEC_VARS_REV:ts/} .endif .endif .endif diff --git a/mk/sys.mk b/mk/sys.mk index b21dfa8b4ebf..7ef8f724ef10 100644 --- a/mk/sys.mk +++ b/mk/sys.mk @@ -1,156 +1,156 @@ -# $Id: sys.mk,v 1.51 2020/08/19 17:51:53 sjg Exp $ +# $Id: sys.mk,v 1.52 2020/12/22 20:44:24 sjg Exp $ # # @(#) Copyright (c) 2003-2009, Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise # use this file is hereby granted provided that # the above copyright notice and this notice are # left intact. # # Please send copies of changes and bug-fixes to: # sjg@crufty.net # # Avoid putting anything platform specific in here. # _DEBUG_MAKE_FLAGS etc. .include .if !empty(_DEBUG_MAKE_FLAGS) .if ${_DEBUG_MAKE_SYS_DIRS:Uno:@x@${.CURDIR:M$x}@} != "" .MAKEFLAGS: ${_DEBUG_MAKE_FLAGS} .endif .endif # useful modifiers .include # we expect a recent bmake .if !defined(_TARGETS) # some things we do only once _TARGETS := ${.TARGETS} .-include .endif # we need HOST_TARGET etc below. .include # early customizations .-include # Popular suffixes for C++ CXX_SUFFIXES += .cc .cpp .cxx .C CXX_SUFFIXES := ${CXX_SUFFIXES:O:u} # find the OS specifics .if defined(SYS_OS_MK) .include <${SYS_OS_MK}> .else _sys_mk = .for x in ${HOST_OSTYPE} ${HOST_TARGET} ${HOST_OS} ${MACHINE} Generic .if empty(_sys_mk) .-include _sys_mk := ${.MAKE.MAKEFILES:M*/$x.mk} .if !empty(_sys_mk) _sys_mk := sys/${_sys_mk:T} .endif .endif .if empty(_sys_mk) # might be an old style .-include <$x.sys.mk> _sys_mk := ${.MAKE.MAKEFILES:M*/$x.sys.mk:T} .endif .endfor SYS_OS_MK := ${_sys_mk} .export SYS_OS_MK .endif # some options we need to know early OPTIONS_DEFAULT_NO += \ DIRDEPS_BUILD \ DIRDEPS_CACHE OPTIONS_DEFAULT_DEPENDENT += \ AUTO_OBJ/DIRDEPS_BUILD \ META_MODE/DIRDEPS_BUILD \ STAGING/DIRDEPS_BUILD \ STATIC_DIRDEPS_CACHE/DIRDEPS_CACHE \ .-include .if ${MK_DIRDEPS_BUILD:Uno} == "yes" MK_META_MODE = yes .-include .elif ${MK_META_MODE:Uno} == "yes" .MAKE.MODE = meta verbose ${META_MODE} .endif # make sure we have a harmless value .MAKE.MODE ?= normal # if you want objdirs make them automatic # and do it early before we compute .PATH .if ${MK_AUTO_OBJ:Uno} == "yes" || ${MKOBJDIRS:Uno} == "auto" .include .endif .if !empty(SRCTOP) .if ${.CURDIR} == ${SRCTOP} RELDIR = . .elif ${.CURDIR:M${SRCTOP}/*} RELDIR := ${.CURDIR:S,${SRCTOP}/,,} .endif .endif MACHINE_ARCH.host ?= ${_HOST_ARCH} MACHINE_ARCH.${MACHINE} ?= ${MACHINE} .if empty(MACHINE_ARCH) MACHINE_ARCH = ${MACHINE_ARCH.${MACHINE}} .endif .ifndef ROOT_GROUP ROOT_GROUP != sed -n /:0:/s/:.*//p /etc/group .export ROOT_GROUP .endif unix ?= We run ${_HOST_OSNAME}. # We need a Bourne/POSIX shell -MAKE_SHELL ?= sh -SHELL ?= ${MAKE_SHELL} +MAKE_SHELL ?= ${.SHELL:Ush} +SHELL := ${MAKE_SHELL} # A race condition in mkdir, means that it can bail if another # process made a dir that mkdir expected to. # We repeat the mkdir -p a number of times to try and work around this. # We stop looping as soon as the dir exists. # If we get to the end of the loop, a plain mkdir will issue an error. Mkdirs= Mkdirs() { \ for d in $$*; do \ for i in 1 2 3 4 5 6; do \ mkdir -p $$d; \ test -d $$d && return 0; \ done; \ mkdir $$d || exit $$?; \ done; } # this often helps with debugging .SUFFIXES: .cpp-out .c.cpp-out: @${COMPILE.c:N-c} -E ${.IMPSRC} | grep -v '^[ ]*$$' ${CXX_SUFFIXES:%=%.cpp-out}: @${COMPILE.cc:N-c} -E ${.IMPSRC} | grep -v '^[ ]*$$' # late customizations .-include # if .CURDIR is matched by any entry in DEBUG_MAKE_DIRS we # will apply DEBUG_MAKE_FLAGS, now. .if !empty(_DEBUG_MAKE_FLAGS) .if ${_DEBUG_MAKE_DIRS:Uno:@x@${.CURDIR:M$x}@} != "" .MAKEFLAGS: ${_DEBUG_MAKE_FLAGS} .endif .endif diff --git a/nonints.h b/nonints.h index f089b39ca50e..41194f104f13 100644 --- a/nonints.h +++ b/nonints.h @@ -1,334 +1,392 @@ -/* $NetBSD: nonints.h,v 1.162 2020/11/16 21:48:18 rillig Exp $ */ +/* $NetBSD: nonints.h,v 1.186 2020/12/28 00:46:24 rillig Exp $ */ /*- * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)nonints.h 8.3 (Berkeley) 3/19/94 */ /*- * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)nonints.h 8.3 (Berkeley) 3/19/94 */ /* arch.c */ void Arch_Init(void); void Arch_End(void); Boolean Arch_ParseArchive(char **, GNodeList *, GNode *); void Arch_Touch(GNode *); void Arch_TouchLib(GNode *); void Arch_UpdateMTime(GNode *gn); void Arch_UpdateMemberMTime(GNode *gn); void Arch_FindLib(GNode *, SearchPath *); Boolean Arch_LibOODate(GNode *); Boolean Arch_IsLib(GNode *); /* compat.c */ -int Compat_RunCommand(const char *, GNode *); +int Compat_RunCommand(const char *, GNode *, StringListNode *); void Compat_Run(GNodeList *); void Compat_Make(GNode *, GNode *); /* cond.c */ CondEvalResult Cond_EvalCondition(const char *, Boolean *); CondEvalResult Cond_EvalLine(const char *); void Cond_restore_depth(unsigned int); unsigned int Cond_save_depth(void); +/* dir.c; see also dir.h */ + +MAKE_INLINE const char * +str_basename(const char *pathname) +{ + const char *lastSlash = strrchr(pathname, '/'); + return lastSlash != NULL ? lastSlash + 1 : pathname; +} + +MAKE_INLINE SearchPath * +SearchPath_New(void) +{ return Lst_New(); } + +void SearchPath_Free(SearchPath *); + /* for.c */ int For_Eval(const char *); Boolean For_Accum(const char *); void For_Run(int); /* job.c */ #ifdef WAIT_T void JobReapChild(pid_t, WAIT_T, Boolean); #endif /* main.c */ Boolean GetBooleanVar(const char *, Boolean); void Main_ParseArgLine(const char *); -void MakeMode(const char *); char *Cmd_Exec(const char *, const char **); void Error(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2); void Fatal(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2) MAKE_ATTR_DEAD; void Punt(const char *, ...) MAKE_ATTR_PRINTFLIKE(1, 2) MAKE_ATTR_DEAD; void DieHorribly(void) MAKE_ATTR_DEAD; void Finish(int) MAKE_ATTR_DEAD; int eunlink(const char *); void execDie(const char *, const char *); char *getTmpdir(void); Boolean ParseBoolean(const char *, Boolean); char *cached_realpath(const char *, char *); /* parse.c */ void Parse_Init(void); void Parse_End(void); typedef enum VarAssignOp { - VAR_NORMAL, /* = */ - VAR_SUBST, /* := */ - VAR_SHELL, /* != or :sh= */ - VAR_APPEND, /* += */ - VAR_DEFAULT /* ?= */ + VAR_NORMAL, /* = */ + VAR_SUBST, /* := */ + VAR_SHELL, /* != or :sh= */ + VAR_APPEND, /* += */ + VAR_DEFAULT /* ?= */ } VarAssignOp; typedef struct VarAssign { - char *varname; /* unexpanded */ - VarAssignOp op; - const char *value; /* unexpanded */ + char *varname; /* unexpanded */ + VarAssignOp op; + const char *value; /* unexpanded */ } VarAssign; -typedef char *(*NextBufProc)(void *, size_t *); +typedef char *(*ReadMoreProc)(void *, size_t *); void Parse_Error(ParseErrorLevel, const char *, ...) MAKE_ATTR_PRINTFLIKE(2, 3); Boolean Parse_IsVar(const char *, VarAssign *out_var); void Parse_DoVar(VarAssign *, GNode *); void Parse_AddIncludeDir(const char *); void Parse_File(const char *, int); -void Parse_SetInput(const char *, int, int, NextBufProc, void *); -GNodeList *Parse_MainName(void); +void Parse_SetInput(const char *, int, int, ReadMoreProc, void *); +void Parse_MainName(GNodeList *); int Parse_GetFatals(void); /* str.c */ + +/* A read-only string that may need to be freed after use. */ +typedef struct FStr { + const char *str; + void *freeIt; +} FStr; + +/* A modifiable string that may need to be freed after use. */ +typedef struct MFStr { + char *str; + void *freeIt; +} MFStr; + typedef struct Words { - char **words; - size_t len; - void *freeIt; + char **words; + size_t len; + void *freeIt; } Words; +/* Return a string that is the sole owner of str. */ +MAKE_INLINE FStr +FStr_InitOwn(char *str) +{ + return (FStr){ str, str }; +} + +/* Return a string that refers to the shared str. */ +MAKE_INLINE FStr +FStr_InitRefer(const char *str) +{ + return (FStr){ str, NULL }; +} + +MAKE_INLINE void +FStr_Done(FStr *fstr) +{ + free(fstr->freeIt); +} + +/* Return a string that is the sole owner of str. */ +MAKE_INLINE MFStr +MFStr_InitOwn(char *str) +{ + return (MFStr){ str, str }; +} + +/* Return a string that refers to the shared str. */ +MAKE_INLINE MFStr +MFStr_InitRefer(char *str) +{ + return (MFStr){ str, NULL }; +} + +MAKE_INLINE void +MFStr_Done(MFStr *mfstr) +{ + free(mfstr->freeIt); +} + Words Str_Words(const char *, Boolean); MAKE_INLINE void -Words_Free(Words w) { - free(w.words); - free(w.freeIt); +Words_Free(Words w) +{ + free(w.words); + free(w.freeIt); } char *str_concat2(const char *, const char *); char *str_concat3(const char *, const char *, const char *); char *str_concat4(const char *, const char *, const char *, const char *); Boolean Str_Match(const char *, const char *); #ifndef HAVE_STRLCPY /* strlcpy.c */ size_t strlcpy(char *, const char *, size_t); #endif /* suff.c */ void Suff_Init(void); void Suff_End(void); void Suff_ClearSuffixes(void); Boolean Suff_IsTransform(const char *); GNode *Suff_AddTransform(const char *); void Suff_EndTransform(GNode *); void Suff_AddSuffix(const char *, GNode **); SearchPath *Suff_GetPath(const char *); void Suff_DoPaths(void); void Suff_AddInclude(const char *); void Suff_AddLib(const char *); void Suff_FindDeps(GNode *); SearchPath *Suff_FindPath(GNode *); void Suff_SetNull(const char *); void Suff_PrintAll(void); /* targ.c */ void Targ_Init(void); void Targ_End(void); void Targ_Stats(void); GNodeList *Targ_List(void); GNode *GNode_New(const char *); GNode *Targ_FindNode(const char *); GNode *Targ_GetNode(const char *); GNode *Targ_NewInternalNode(const char *); GNode *Targ_GetEndNode(void); -GNodeList *Targ_FindList(StringList *); -Boolean Targ_Ignore(const GNode *); -Boolean Targ_Silent(const GNode *); +void Targ_FindList(GNodeList *, StringList *); Boolean Targ_Precious(const GNode *); void Targ_SetMain(GNode *); void Targ_PrintCmds(GNode *); void Targ_PrintNode(GNode *, int); void Targ_PrintNodes(GNodeList *, int); -char *Targ_FmtTime(time_t); +const char *Targ_FmtTime(time_t); void Targ_PrintType(int); void Targ_PrintGraph(int); void Targ_Propagate(void); /* var.c */ void Var_Init(void); void Var_End(void); typedef enum VarEvalFlags { - VARE_NONE = 0, - - /* Expand and evaluate variables during parsing. - * - * TODO: Document what Var_Parse and Var_Subst return when this flag - * is not set. */ - VARE_WANTRES = 1 << 0, - - /* Treat undefined variables as errors. - * Must only be used in combination with VARE_WANTRES. */ - VARE_UNDEFERR = 1 << 1, - - /* Keep '$$' as '$$' instead of reducing it to a single '$'. - * - * Used in variable assignments using the ':=' operator. It allows - * multiple such assignments to be chained without accidentally expanding - * '$$file' to '$file' in the first assignment and interpreting it as - * '${f}' followed by 'ile' in the next assignment. - * - * See also preserveUndefined, which preserves subexpressions that are - * based on undefined variables; maybe that can be converted to a flag - * as well. */ - VARE_KEEP_DOLLAR = 1 << 2 + VARE_NONE = 0, + + /* Expand and evaluate variables during parsing. + * + * TODO: Document what Var_Parse and Var_Subst return when this flag + * is not set. */ + VARE_WANTRES = 1 << 0, + + /* Treat undefined variables as errors. + * Must only be used in combination with VARE_WANTRES. */ + VARE_UNDEFERR = 1 << 1, + + /* Keep '$$' as '$$' instead of reducing it to a single '$'. + * + * Used in variable assignments using the ':=' operator. It allows + * multiple such assignments to be chained without accidentally + * expanding '$$file' to '$file' in the first assignment and + * interpreting it as '${f}' followed by 'ile' in the next assignment. + * + * See also preserveUndefined, which preserves subexpressions that are + * based on undefined variables; maybe that can be converted to a flag + * as well. */ + VARE_KEEP_DOLLAR = 1 << 2, + + /* + * Keep undefined variables as-is instead of expanding them to an + * empty string. + * + * Example for a ':=' assignment: + * CFLAGS = $(.INCLUDES) + * CFLAGS := -I.. $(CFLAGS) + * # If .INCLUDES (an undocumented special variable, by the + * # way) is still undefined, the updated CFLAGS becomes + * # "-I.. $(.INCLUDES)". + */ + VARE_KEEP_UNDEF = 1 << 3 } VarEvalFlags; typedef enum VarSetFlags { - VAR_SET_NONE = 0, + VAR_SET_NONE = 0, - /* do not export */ - VAR_SET_NO_EXPORT = 1 << 0, + /* do not export */ + VAR_SET_NO_EXPORT = 1 << 0, - /* Make the variable read-only. No further modification is possible, - * except for another call to Var_Set with the same flag. */ - VAR_SET_READONLY = 1 << 1 + /* Make the variable read-only. No further modification is possible, + * except for another call to Var_Set with the same flag. */ + VAR_SET_READONLY = 1 << 1 } VarSetFlags; -/* The state of error handling returned by Var_Parse. - * - * As of 2020-09-13, this bitset looks quite bloated, - * with all the constants doubled. - * - * Its purpose is to first document the existing behavior, - * and then migrate away from the SILENT constants, step by step, - * as these are not suited for reliable, consistent error handling - * and reporting. */ +/* The state of error handling returned by Var_Parse. */ typedef enum VarParseResult { - /* Both parsing and evaluation succeeded. */ - VPR_OK = 0x0000, - - /* See if a message has already been printed for this error. */ - VPR_ANY_MSG = 0x0001, - - /* Parsing failed. - * No error message has been printed yet. - * Deprecated, migrate to VPR_PARSE_MSG instead. */ - VPR_PARSE_SILENT = 0x0002, - - /* Parsing failed. - * An error message has already been printed. */ - VPR_PARSE_MSG = VPR_PARSE_SILENT | VPR_ANY_MSG, - - /* Parsing succeeded. - * During evaluation, VARE_UNDEFERR was set and there was an undefined - * variable. - * No error message has been printed yet. - * Deprecated, migrate to VPR_UNDEF_MSG instead. */ - VPR_UNDEF_SILENT = 0x0004, - - /* Parsing succeeded. - * During evaluation, VARE_UNDEFERR was set and there was an undefined - * variable. - * An error message has already been printed. */ - VPR_UNDEF_MSG = VPR_UNDEF_SILENT | VPR_ANY_MSG, - - /* Parsing succeeded. - * Evaluation failed. - * No error message has been printed yet. - * Deprecated, migrate to VPR_EVAL_MSG instead. */ - VPR_EVAL_SILENT = 0x0006, - - /* Parsing succeeded. - * Evaluation failed. - * An error message has already been printed. */ - VPR_EVAL_MSG = VPR_EVAL_SILENT | VPR_ANY_MSG, - - /* The exact error handling status is not known yet. - * Deprecated, migrate to VPR_OK or any VPE_*_MSG instead. */ - VPR_UNKNOWN = 0x0008 + /* Both parsing and evaluation succeeded. */ + VPR_OK, + + /* Parsing or evaluating failed, with an error message. */ + VPR_ERR, + + /* + * Parsing succeeded, undefined expressions are allowed and the + * expression was still undefined after applying all modifiers. + * No error message is printed in this case. + * + * Some callers handle this case differently, so return this + * information to them, for now. + * + * TODO: Replace this with a new flag VARE_KEEP_UNDEFINED. + */ + VPR_UNDEF + } VarParseResult; +typedef enum VarExportMode { + /* .export-env */ + VEM_ENV, + /* .export: Initial export or update an already exported variable. */ + VEM_PLAIN, + /* .export-literal: Do not expand the variable value. */ + VEM_LITERAL +} VarExportMode; + +void Var_DeleteVar(const char *, GNode *); void Var_Delete(const char *, GNode *); +void Var_Undef(const char *); void Var_Set(const char *, const char *, GNode *); void Var_SetWithFlags(const char *, const char *, GNode *, VarSetFlags); void Var_Append(const char *, const char *, GNode *); Boolean Var_Exists(const char *, GNode *); -const char *Var_Value(const char *, GNode *, void **); +FStr Var_Value(const char *, GNode *); const char *Var_ValueDirect(const char *, GNode *); -VarParseResult Var_Parse(const char **, GNode *, VarEvalFlags, - const char **, void **); +VarParseResult Var_Parse(const char **, GNode *, VarEvalFlags, FStr *); VarParseResult Var_Subst(const char *, GNode *, VarEvalFlags, char **); void Var_Stats(void); void Var_Dump(GNode *); -void Var_ExportVars(void); -void Var_Export(const char *, Boolean); -void Var_UnExport(const char *); +void Var_ReexportVars(void); +void Var_Export(VarExportMode, const char *); +void Var_ExportVars(const char *); +void Var_UnExport(Boolean, const char *); /* util.c */ typedef void (*SignalProc)(int); SignalProc bmake_signal(int, SignalProc); diff --git a/os.sh b/os.sh old mode 100755 new mode 100644 diff --git a/parse.c b/parse.c index d7bd65645aca..aca1015ab30d 100644 --- a/parse.c +++ b/parse.c @@ -1,3180 +1,3290 @@ -/* $NetBSD: parse.c,v 1.443 2020/11/16 21:39:22 rillig Exp $ */ +/* $NetBSD: parse.c,v 1.526 2021/01/10 21:20:46 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Parsing of makefiles. * * Parse_File is the main entry point and controls most of the other * functions in this module. * * The directories for the .include "..." directive are kept in * 'parseIncPath', while those for .include <...> are kept in 'sysIncPath'. * The targets currently being defined are kept in 'targets'. * * Interface: * Parse_Init Initialize the module * * Parse_End Clean up the module * * Parse_File Parse a top-level makefile. Included files are * handled by Parse_include_file though. * * Parse_IsVar Return TRUE if the given line is a variable * assignment. Used by MainParseArgs to determine if * an argument is a target or a variable assignment. * Used internally for pretty much the same thing. * * Parse_Error Report a parse error, a warning or an informational * message. * * Parse_MainName Returns a list of the main target to create. */ #include #include #include #include #include "make.h" #ifdef HAVE_STDINT_H #include #endif #ifdef HAVE_MMAP #include #ifndef MAP_COPY #define MAP_COPY MAP_PRIVATE #endif #ifndef MAP_FILE #define MAP_FILE 0 #endif #endif #include "dir.h" #include "job.h" #include "pathnames.h" /* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: parse.c,v 1.443 2020/11/16 21:39:22 rillig Exp $"); +MAKE_RCSID("$NetBSD: parse.c,v 1.526 2021/01/10 21:20:46 rillig Exp $"); /* types and constants */ /* * Structure for a file being read ("included file") */ typedef struct IFile { - char *fname; /* name of file (relative? absolute?) */ - Boolean fromForLoop; /* simulated .include by the .for loop */ - int lineno; /* current line number in file */ - int first_lineno; /* line number of start of text */ - unsigned int cond_depth; /* 'if' nesting when file opened */ - Boolean depending; /* state of doing_depend on EOF */ - - /* The buffer from which the file's content is read. */ - char *buf_freeIt; - char *buf_ptr; /* next char to be read */ - char *buf_end; - - char *(*nextbuf)(void *, size_t *); /* Function to get more data */ - void *nextbuf_arg; /* Opaque arg for nextbuf() */ - struct loadedfile *lf; /* loadedfile object, if any */ + char *fname; /* name of file (relative? absolute?) */ + Boolean fromForLoop; /* simulated .include by the .for loop */ + int lineno; /* current line number in file */ + int first_lineno; /* line number of start of text */ + unsigned int cond_depth; /* 'if' nesting when file opened */ + Boolean depending; /* state of doing_depend on EOF */ + + /* The buffer from which the file's content is read. */ + char *buf_freeIt; + char *buf_ptr; /* next char to be read */ + char *buf_end; + + /* Function to read more data, with a single opaque argument. */ + ReadMoreProc readMore; + void *readMoreArg; + + struct loadedfile *lf; /* loadedfile object, if any */ } IFile; /* * Tokens for target attributes */ typedef enum ParseSpecial { - SP_ATTRIBUTE, /* Generic attribute */ - SP_BEGIN, /* .BEGIN */ - SP_DEFAULT, /* .DEFAULT */ - SP_DELETE_ON_ERROR, /* .DELETE_ON_ERROR */ - SP_END, /* .END */ - SP_ERROR, /* .ERROR */ - SP_IGNORE, /* .IGNORE */ - SP_INCLUDES, /* .INCLUDES; not mentioned in the manual page */ - SP_INTERRUPT, /* .INTERRUPT */ - SP_LIBS, /* .LIBS; not mentioned in the manual page */ - SP_MAIN, /* .MAIN and we don't have anything user-specified to - * make */ - SP_META, /* .META */ - SP_MFLAGS, /* .MFLAGS or .MAKEFLAGS */ - SP_NOMETA, /* .NOMETA */ - SP_NOMETA_CMP, /* .NOMETA_CMP */ - SP_NOPATH, /* .NOPATH */ - SP_NOT, /* Not special */ - SP_NOTPARALLEL, /* .NOTPARALLEL or .NO_PARALLEL */ - SP_NULL, /* .NULL; not mentioned in the manual page */ - SP_OBJDIR, /* .OBJDIR */ - SP_ORDER, /* .ORDER */ - SP_PARALLEL, /* .PARALLEL; not mentioned in the manual page */ - SP_PATH, /* .PATH or .PATH.suffix */ - SP_PHONY, /* .PHONY */ + SP_ATTRIBUTE, /* Generic attribute */ + SP_BEGIN, /* .BEGIN */ + SP_DEFAULT, /* .DEFAULT */ + SP_DELETE_ON_ERROR, /* .DELETE_ON_ERROR */ + SP_END, /* .END */ + SP_ERROR, /* .ERROR */ + SP_IGNORE, /* .IGNORE */ + SP_INCLUDES, /* .INCLUDES; not mentioned in the manual page */ + SP_INTERRUPT, /* .INTERRUPT */ + SP_LIBS, /* .LIBS; not mentioned in the manual page */ + /* .MAIN and we don't have anything user-specified to make */ + SP_MAIN, + SP_META, /* .META */ + SP_MFLAGS, /* .MFLAGS or .MAKEFLAGS */ + SP_NOMETA, /* .NOMETA */ + SP_NOMETA_CMP, /* .NOMETA_CMP */ + SP_NOPATH, /* .NOPATH */ + SP_NOT, /* Not special */ + SP_NOTPARALLEL, /* .NOTPARALLEL or .NO_PARALLEL */ + SP_NULL, /* .NULL; not mentioned in the manual page */ + SP_OBJDIR, /* .OBJDIR */ + SP_ORDER, /* .ORDER */ + SP_PARALLEL, /* .PARALLEL; not mentioned in the manual page */ + SP_PATH, /* .PATH or .PATH.suffix */ + SP_PHONY, /* .PHONY */ #ifdef POSIX - SP_POSIX, /* .POSIX; not mentioned in the manual page */ + SP_POSIX, /* .POSIX; not mentioned in the manual page */ #endif - SP_PRECIOUS, /* .PRECIOUS */ - SP_SHELL, /* .SHELL */ - SP_SILENT, /* .SILENT */ - SP_SINGLESHELL, /* .SINGLESHELL; not mentioned in the manual page */ - SP_STALE, /* .STALE */ - SP_SUFFIXES, /* .SUFFIXES */ - SP_WAIT /* .WAIT */ + SP_PRECIOUS, /* .PRECIOUS */ + SP_SHELL, /* .SHELL */ + SP_SILENT, /* .SILENT */ + SP_SINGLESHELL, /* .SINGLESHELL; not mentioned in the manual page */ + SP_STALE, /* .STALE */ + SP_SUFFIXES, /* .SUFFIXES */ + SP_WAIT /* .WAIT */ } ParseSpecial; typedef List SearchPathList; typedef ListNode SearchPathListNode; /* result data */ /* * The main target to create. This is the first target on the first * dependency line in the first makefile. */ static GNode *mainNode; /* eval state */ -/* During parsing, the targets from the left-hand side of the currently +/* + * During parsing, the targets from the left-hand side of the currently * active dependency line, or NULL if the current line does not belong to a * dependency line, for example because it is a variable assignment. * - * See unit-tests/deptgt.mk, keyword "parse.c:targets". */ + * See unit-tests/deptgt.mk, keyword "parse.c:targets". + */ static GNodeList *targets; #ifdef CLEANUP -/* All shell commands for all targets, in no particular order and possibly +/* + * All shell commands for all targets, in no particular order and possibly * with duplicates. Kept in a separate list since the commands from .USE or * .USEBEFORE nodes are shared with other GNodes, thereby giving up the - * easily understandable ownership over the allocated strings. */ -static StringList *targCmds; + * easily understandable ownership over the allocated strings. + */ +static StringList targCmds = LST_INIT; #endif /* * Predecessor node for handling .ORDER. Initialized to NULL when .ORDER * seen, then set to each successive source on the line. */ static GNode *order_pred; /* parser state */ /* number of fatal errors */ static int fatals = 0; /* * Variables for doing includes */ -/* The include chain of makefiles. At the bottom is the top-level makefile +/* + * The include chain of makefiles. At the bottom is the top-level makefile * from the command line, and on top of that, there are the included files or * .for loops, up to and including the current file. * * This data could be used to print stack traces on parse errors. As of * 2020-09-14, this is not done though. It seems quite simple to print the * tuples (fname:lineno:fromForLoop), from top to bottom. This simple idea is * made complicated by the fact that the .for loops also use this stack for * storing information. * * The lineno fields of the IFiles with fromForLoop == TRUE look confusing, * which is demonstrated by the test 'include-main.mk'. They seem sorted * backwards since they tell the number of completely parsed lines, which for * a .for loop is right after the terminating .endfor. To compensate for this * confusion, there is another field first_lineno pointing at the start of the * .for loop, 1-based for human consumption. * * To make the stack trace intuitive, the entry below the first .for loop must * be ignored completely since neither its lineno nor its first_lineno is * useful. Instead, the topmost of each chain of .for loop needs to be * printed twice, once with its first_lineno and once with its lineno. * * As of 2020-10-28, using the above rules, the stack trace for the .info line * in include-subsub.mk would be: * * includes[5]: include-subsub.mk:4 * (lineno, from an .include) * includes[4]: include-sub.mk:32 * (lineno, from a .for loop below an .include) * includes[4]: include-sub.mk:31 * (first_lineno, from a .for loop, lineno == 32) * includes[3]: include-sub.mk:30 * (first_lineno, from a .for loop, lineno == 33) * includes[2]: include-sub.mk:29 * (first_lineno, from a .for loop, lineno == 34) * includes[1]: include-sub.mk:35 * (not printed since it is below a .for loop) * includes[0]: include-main.mk:27 */ static Vector /* of IFile */ includes; static IFile * GetInclude(size_t i) { - return Vector_Get(&includes, i); + return Vector_Get(&includes, i); } /* The file that is currently being read. */ static IFile * CurFile(void) { - return GetInclude(includes.len - 1); + return GetInclude(includes.len - 1); } /* include paths */ SearchPath *parseIncPath; /* dirs for "..." includes */ SearchPath *sysIncPath; /* dirs for <...> includes */ SearchPath *defSysIncPath; /* default for sysIncPath */ /* parser tables */ /* * The parseKeywords table is searched using binary search when deciding * if a target or source is special. The 'spec' field is the ParseSpecial * type of the keyword (SP_NOT if the keyword isn't special as a target) while * the 'op' field is the operator to apply to the list of targets if the * keyword is used as a source ("0" if the keyword isn't special as a source) */ static const struct { - const char *name; /* Name of keyword */ - ParseSpecial spec; /* Type when used as a target */ - GNodeType op; /* Operator when used as a source */ + const char *name; /* Name of keyword */ + ParseSpecial spec; /* Type when used as a target */ + GNodeType op; /* Operator when used as a source */ } parseKeywords[] = { - { ".BEGIN", SP_BEGIN, 0 }, - { ".DEFAULT", SP_DEFAULT, 0 }, - { ".DELETE_ON_ERROR", SP_DELETE_ON_ERROR, 0 }, - { ".END", SP_END, 0 }, - { ".ERROR", SP_ERROR, 0 }, + { ".BEGIN", SP_BEGIN, OP_NONE }, + { ".DEFAULT", SP_DEFAULT, OP_NONE }, + { ".DELETE_ON_ERROR", SP_DELETE_ON_ERROR, OP_NONE }, + { ".END", SP_END, OP_NONE }, + { ".ERROR", SP_ERROR, OP_NONE }, { ".EXEC", SP_ATTRIBUTE, OP_EXEC }, { ".IGNORE", SP_IGNORE, OP_IGNORE }, - { ".INCLUDES", SP_INCLUDES, 0 }, - { ".INTERRUPT", SP_INTERRUPT, 0 }, + { ".INCLUDES", SP_INCLUDES, OP_NONE }, + { ".INTERRUPT", SP_INTERRUPT, OP_NONE }, { ".INVISIBLE", SP_ATTRIBUTE, OP_INVISIBLE }, { ".JOIN", SP_ATTRIBUTE, OP_JOIN }, - { ".LIBS", SP_LIBS, 0 }, + { ".LIBS", SP_LIBS, OP_NONE }, { ".MADE", SP_ATTRIBUTE, OP_MADE }, - { ".MAIN", SP_MAIN, 0 }, + { ".MAIN", SP_MAIN, OP_NONE }, { ".MAKE", SP_ATTRIBUTE, OP_MAKE }, - { ".MAKEFLAGS", SP_MFLAGS, 0 }, + { ".MAKEFLAGS", SP_MFLAGS, OP_NONE }, { ".META", SP_META, OP_META }, - { ".MFLAGS", SP_MFLAGS, 0 }, + { ".MFLAGS", SP_MFLAGS, OP_NONE }, { ".NOMETA", SP_NOMETA, OP_NOMETA }, { ".NOMETA_CMP", SP_NOMETA_CMP, OP_NOMETA_CMP }, { ".NOPATH", SP_NOPATH, OP_NOPATH }, { ".NOTMAIN", SP_ATTRIBUTE, OP_NOTMAIN }, - { ".NOTPARALLEL", SP_NOTPARALLEL, 0 }, - { ".NO_PARALLEL", SP_NOTPARALLEL, 0 }, - { ".NULL", SP_NULL, 0 }, - { ".OBJDIR", SP_OBJDIR, 0 }, + { ".NOTPARALLEL", SP_NOTPARALLEL, OP_NONE }, + { ".NO_PARALLEL", SP_NOTPARALLEL, OP_NONE }, + { ".NULL", SP_NULL, OP_NONE }, + { ".OBJDIR", SP_OBJDIR, OP_NONE }, { ".OPTIONAL", SP_ATTRIBUTE, OP_OPTIONAL }, - { ".ORDER", SP_ORDER, 0 }, - { ".PARALLEL", SP_PARALLEL, 0 }, - { ".PATH", SP_PATH, 0 }, + { ".ORDER", SP_ORDER, OP_NONE }, + { ".PARALLEL", SP_PARALLEL, OP_NONE }, + { ".PATH", SP_PATH, OP_NONE }, { ".PHONY", SP_PHONY, OP_PHONY }, #ifdef POSIX - { ".POSIX", SP_POSIX, 0 }, + { ".POSIX", SP_POSIX, OP_NONE }, #endif { ".PRECIOUS", SP_PRECIOUS, OP_PRECIOUS }, { ".RECURSIVE", SP_ATTRIBUTE, OP_MAKE }, - { ".SHELL", SP_SHELL, 0 }, + { ".SHELL", SP_SHELL, OP_NONE }, { ".SILENT", SP_SILENT, OP_SILENT }, - { ".SINGLESHELL", SP_SINGLESHELL, 0 }, - { ".STALE", SP_STALE, 0 }, - { ".SUFFIXES", SP_SUFFIXES, 0 }, + { ".SINGLESHELL", SP_SINGLESHELL, OP_NONE }, + { ".STALE", SP_STALE, OP_NONE }, + { ".SUFFIXES", SP_SUFFIXES, OP_NONE }, { ".USE", SP_ATTRIBUTE, OP_USE }, { ".USEBEFORE", SP_ATTRIBUTE, OP_USEBEFORE }, - { ".WAIT", SP_WAIT, 0 }, + { ".WAIT", SP_WAIT, OP_NONE }, }; /* file loader */ struct loadedfile { /* XXX: What is the lifetime of this path? Who manages the memory? */ - const char *path; /* name, for error reports */ - char *buf; /* contents buffer */ - size_t len; /* length of contents */ - size_t maplen; /* length of mmap area, or 0 */ - Boolean used; /* XXX: have we used the data yet */ + const char *path; /* name, for error reports */ + char *buf; /* contents buffer */ + size_t len; /* length of contents */ + Boolean used; /* XXX: have we used the data yet */ }; /* XXX: What is the lifetime of the path? Who manages the memory? */ static struct loadedfile * -loadedfile_create(const char *path) +loadedfile_create(const char *path, char *buf, size_t buflen) { struct loadedfile *lf; lf = bmake_malloc(sizeof *lf); lf->path = path == NULL ? "(stdin)" : path; - lf->buf = NULL; - lf->len = 0; - lf->maplen = 0; + lf->buf = buf; + lf->len = buflen; lf->used = FALSE; return lf; } static void loadedfile_destroy(struct loadedfile *lf) { - if (lf->buf != NULL) { -#ifdef HAVE_MMAP - if (lf->maplen > 0) - munmap(lf->buf, lf->maplen); - else -#endif - free(lf->buf); - } + free(lf->buf); free(lf); } /* - * nextbuf() operation for loadedfile, as needed by the weird and twisted - * logic below. Once that's cleaned up, we can get rid of lf->used... + * readMore() operation for loadedfile, as needed by the weird and twisted + * logic below. Once that's cleaned up, we can get rid of lf->used. */ static char * -loadedfile_nextbuf(void *x, size_t *len) +loadedfile_readMore(void *x, size_t *len) { struct loadedfile *lf = x; if (lf->used) return NULL; lf->used = TRUE; *len = lf->len; return lf->buf; } /* * Try to get the size of a file. */ static Boolean load_getsize(int fd, size_t *ret) { struct stat st; if (fstat(fd, &st) < 0) return FALSE; if (!S_ISREG(st.st_mode)) return FALSE; /* * st_size is an off_t, which is 64 bits signed; *ret is * size_t, which might be 32 bits unsigned or 64 bits * unsigned. Rather than being elaborate, just punt on - * files that are more than 2^31 bytes. We should never - * see a makefile that size in practice... + * files that are more than 1 GiB. We should never + * see a makefile that size in practice. * * While we're at it reject negative sizes too, just in case. */ - if (st.st_size < 0 || st.st_size > 0x7fffffff) + if (st.st_size < 0 || st.st_size > 0x3fffffff) return FALSE; *ret = (size_t)st.st_size; return TRUE; } -#ifdef HAVE_MMAP -static Boolean -loadedfile_mmap(struct loadedfile *lf, int fd) -{ - static unsigned long pagesize = 0; - - if (!load_getsize(fd, &lf->len)) - return FALSE; - - /* found a size, try mmap */ -#ifdef _SC_PAGESIZE - if (pagesize == 0) - pagesize = (unsigned long)sysconf(_SC_PAGESIZE); -#endif - if (pagesize == 0 || pagesize == (unsigned long)-1) - pagesize = 0x1000; - - /* round size up to a page */ - lf->maplen = pagesize * ((lf->len + pagesize - 1) / pagesize); - - /* - * XXX hack for dealing with empty files; remove when - * we're no longer limited by interfacing to the old - * logic elsewhere in this file. - */ - if (lf->maplen == 0) - lf->maplen = pagesize; - - /* - * FUTURE: remove PROT_WRITE when the parser no longer - * needs to scribble on the input. - */ - lf->buf = mmap(NULL, lf->maplen, PROT_READ|PROT_WRITE, - MAP_FILE|MAP_COPY, fd, 0); - if (lf->buf == MAP_FAILED) - return FALSE; - - if (lf->len == lf->maplen && lf->buf[lf->len - 1] != '\n') { - char *b = bmake_malloc(lf->len + 1); - b[lf->len] = '\n'; - memcpy(b, lf->buf, lf->len++); - munmap(lf->buf, lf->maplen); - lf->maplen = 0; - lf->buf = b; - } - - return TRUE; -} -#endif - /* * Read in a file. * * Until the path search logic can be moved under here instead of * being in the caller in another source file, we need to have the fd * passed in already open. Bleh. * * If the path is NULL, use stdin. */ static struct loadedfile * loadfile(const char *path, int fd) { - struct loadedfile *lf; - ssize_t result; - size_t bufpos; + ssize_t n; + Buffer buf; + size_t filesize; - lf = loadedfile_create(path); if (path == NULL) { assert(fd == -1); fd = STDIN_FILENO; - } else { -#if 0 /* notyet */ - fd = open(path, O_RDONLY); - if (fd < 0) { - ... - Error("%s: %s", path, strerror(errno)); - exit(1); - } -#endif } -#ifdef HAVE_MMAP - if (loadedfile_mmap(lf, fd)) - goto done; -#endif - - /* cannot mmap; load the traditional way */ - - lf->maplen = 0; - lf->len = 1024; - lf->buf = bmake_malloc(lf->len); + if (load_getsize(fd, &filesize)) { + /* + * Avoid resizing the buffer later for no reason. + * + * At the same time leave space for adding a final '\n', + * just in case it is missing in the file. + */ + filesize++; + } else + filesize = 1024; + Buf_InitSize(&buf, filesize); - bufpos = 0; for (;;) { - assert(bufpos <= lf->len); - if (bufpos == lf->len) { - if (lf->len > SIZE_MAX/2) { + assert(buf.len <= buf.cap); + if (buf.len == buf.cap) { + if (buf.cap > 0x1fffffff) { errno = EFBIG; Error("%s: file too large", path); - exit(1); + exit(2); /* Not 1 so -q can distinguish error */ } - lf->len *= 2; - lf->buf = bmake_realloc(lf->buf, lf->len); + Buf_Expand(&buf); } - assert(bufpos < lf->len); - result = read(fd, lf->buf + bufpos, lf->len - bufpos); - if (result < 0) { + assert(buf.len < buf.cap); + n = read(fd, buf.data + buf.len, buf.cap - buf.len); + if (n < 0) { Error("%s: read error: %s", path, strerror(errno)); - exit(1); + exit(2); /* Not 1 so -q can distinguish error */ } - if (result == 0) + if (n == 0) break; - bufpos += (size_t)result; + buf.len += (size_t)n; } - assert(bufpos <= lf->len); - lf->len = bufpos; + assert(buf.len <= buf.cap); - /* truncate malloc region to actual length (maybe not useful) */ - if (lf->len > 0) { - /* as for mmap case, ensure trailing \n */ - if (lf->buf[lf->len - 1] != '\n') - lf->len++; - lf->buf = bmake_realloc(lf->buf, lf->len); - lf->buf[lf->len - 1] = '\n'; - } + if (!Buf_EndsWith(&buf, '\n')) + Buf_AddByte(&buf, '\n'); -#ifdef HAVE_MMAP -done: -#endif if (path != NULL) close(fd); - return lf; + { + struct loadedfile *lf = loadedfile_create(path, + buf.data, buf.len); + Buf_Destroy(&buf, FALSE); + return lf; + } } /* old code */ /* Check if the current character is escaped on the current line. */ static Boolean ParseIsEscaped(const char *line, const char *c) { - Boolean active = FALSE; - for (;;) { - if (line == c) - return active; - if (*--c != '\\') - return active; - active = !active; - } + Boolean active = FALSE; + for (;;) { + if (line == c) + return active; + if (*--c != '\\') + return active; + active = !active; + } } -/* Add the filename and lineno to the GNode so that we remember where it - * was first defined. */ +/* + * Add the filename and lineno to the GNode so that we remember where it + * was first defined. + */ static void ParseMark(GNode *gn) { - IFile *curFile = CurFile(); - gn->fname = curFile->fname; - gn->lineno = curFile->lineno; + IFile *curFile = CurFile(); + gn->fname = curFile->fname; + gn->lineno = curFile->lineno; } -/* Look in the table of keywords for one matching the given string. - * Return the index of the keyword, or -1 if it isn't there. */ +/* + * Look in the table of keywords for one matching the given string. + * Return the index of the keyword, or -1 if it isn't there. + */ static int ParseFindKeyword(const char *str) { - int start = 0; - int end = sizeof parseKeywords / sizeof parseKeywords[0] - 1; + int start = 0; + int end = sizeof parseKeywords / sizeof parseKeywords[0] - 1; - do { - int cur = start + (end - start) / 2; - int diff = strcmp(str, parseKeywords[cur].name); + do { + int curr = start + (end - start) / 2; + int diff = strcmp(str, parseKeywords[curr].name); - if (diff == 0) - return cur; - if (diff < 0) - end = cur - 1; - else - start = cur + 1; - } while (start <= end); + if (diff == 0) + return curr; + if (diff < 0) + end = curr - 1; + else + start = curr + 1; + } while (start <= end); - return -1; + return -1; } static void PrintLocation(FILE *f, const char *fname, size_t lineno) { - char dirbuf[MAXPATHLEN+1]; - const char *dir, *base; - void *dir_freeIt, *base_freeIt; + char dirbuf[MAXPATHLEN + 1]; + FStr dir, base; if (*fname == '/' || strcmp(fname, "(stdin)") == 0) { - (void)fprintf(f, "\"%s\" line %zu: ", fname, lineno); + (void)fprintf(f, "\"%s\" line %u: ", fname, (unsigned)lineno); return; } /* Find out which makefile is the culprit. * We try ${.PARSEDIR} and apply realpath(3) if not absolute. */ - dir = Var_Value(".PARSEDIR", VAR_GLOBAL, &dir_freeIt); - if (dir == NULL) - dir = "."; - if (*dir != '/') - dir = realpath(dir, dirbuf); + dir = Var_Value(".PARSEDIR", VAR_GLOBAL); + if (dir.str == NULL) + dir.str = "."; + if (dir.str[0] != '/') + dir.str = realpath(dir.str, dirbuf); - base = Var_Value(".PARSEFILE", VAR_GLOBAL, &base_freeIt); - if (base == NULL) { - const char *slash = strrchr(fname, '/'); - base = slash != NULL ? slash + 1 : fname; - } + base = Var_Value(".PARSEFILE", VAR_GLOBAL); + if (base.str == NULL) + base.str = str_basename(fname); - (void)fprintf(f, "\"%s/%s\" line %zu: ", dir, base, lineno); - bmake_free(base_freeIt); - bmake_free(dir_freeIt); + (void)fprintf(f, "\"%s/%s\" line %u: ", + dir.str, base.str, (unsigned)lineno); + + FStr_Done(&base); + FStr_Done(&dir); } static void ParseVErrorInternal(FILE *f, const char *fname, size_t lineno, ParseErrorLevel type, const char *fmt, va_list ap) { static Boolean fatal_warning_error_printed = FALSE; (void)fprintf(f, "%s: ", progname); if (fname != NULL) PrintLocation(f, fname, lineno); if (type == PARSE_WARNING) (void)fprintf(f, "warning: "); (void)vfprintf(f, fmt, ap); (void)fprintf(f, "\n"); (void)fflush(f); if (type == PARSE_INFO) return; if (type == PARSE_FATAL || opts.parseWarnFatal) fatals++; if (opts.parseWarnFatal && !fatal_warning_error_printed) { Error("parsing warnings being treated as errors"); fatal_warning_error_printed = TRUE; } } static void ParseErrorInternal(const char *fname, size_t lineno, ParseErrorLevel type, const char *fmt, ...) { va_list ap; (void)fflush(stdout); va_start(ap, fmt); ParseVErrorInternal(stderr, fname, lineno, type, fmt, ap); va_end(ap); if (opts.debug_file != stderr && opts.debug_file != stdout) { va_start(ap, fmt); ParseVErrorInternal(opts.debug_file, fname, lineno, type, - fmt, ap); + fmt, ap); va_end(ap); } } -/* Print a parse error message, including location information. +/* + * Print a parse error message, including location information. * * If the level is PARSE_FATAL, continue parsing until the end of the * current top-level makefile, then exit (see Parse_File). * - * Fmt is given without a trailing newline. */ + * Fmt is given without a trailing newline. + */ void Parse_Error(ParseErrorLevel type, const char *fmt, ...) { va_list ap; const char *fname; size_t lineno; if (includes.len == 0) { fname = NULL; lineno = 0; } else { IFile *curFile = CurFile(); fname = curFile->fname; lineno = (size_t)curFile->lineno; } va_start(ap, fmt); (void)fflush(stdout); ParseVErrorInternal(stderr, fname, lineno, type, fmt, ap); va_end(ap); if (opts.debug_file != stderr && opts.debug_file != stdout) { va_start(ap, fmt); ParseVErrorInternal(opts.debug_file, fname, lineno, type, - fmt, ap); + fmt, ap); va_end(ap); } } -/* Parse and handle a .info, .warning or .error directive. - * For an .error directive, immediately exit. */ -static Boolean -ParseMessage(const char *directive) +/* + * Parse and handle a .info, .warning or .error directive. + * For an .error directive, immediately exit. + */ +static void +ParseMessage(ParseErrorLevel level, const char *levelName, const char *umsg) { - const char *p = directive; - int mtype = *p == 'i' ? PARSE_INFO : - *p == 'w' ? PARSE_WARNING : PARSE_FATAL; - char *arg; + char *xmsg; - while (ch_isalpha(*p)) - p++; - if (!ch_isspace(*p)) - return FALSE; /* missing argument */ + if (umsg[0] == '\0') { + Parse_Error(PARSE_FATAL, "Missing argument for \".%s\"", + levelName); + return; + } - cpp_skip_whitespace(&p); - (void)Var_Subst(p, VAR_CMDLINE, VARE_WANTRES, &arg); - /* TODO: handle errors */ + (void)Var_Subst(umsg, VAR_CMDLINE, VARE_WANTRES, &xmsg); + /* TODO: handle errors */ - Parse_Error(mtype, "%s", arg); - free(arg); + Parse_Error(level, "%s", xmsg); + free(xmsg); - if (mtype == PARSE_FATAL) { - PrintOnError(NULL, NULL); - exit(1); - } - return TRUE; + if (level == PARSE_FATAL) { + PrintOnError(NULL, NULL); + exit(1); + } } -/* Add the child to the parent's children. +/* + * Add the child to the parent's children. * * Additionally, add the parent to the child's parents, but only if the * target is not special. An example for such a special target is .END, - * which does not need to be informed once the child target has been made. */ + * which does not need to be informed once the child target has been made. + */ static void LinkSource(GNode *pgn, GNode *cgn, Boolean isSpecial) { - if ((pgn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(pgn->cohorts)) - pgn = pgn->cohorts->last->datum; + if ((pgn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(&pgn->cohorts)) + pgn = pgn->cohorts.last->datum; - Lst_Append(pgn->children, cgn); - pgn->unmade++; + Lst_Append(&pgn->children, cgn); + pgn->unmade++; - /* Special targets like .END don't need any children. */ - if (!isSpecial) - Lst_Append(cgn->parents, pgn); + /* Special targets like .END don't need any children. */ + if (!isSpecial) + Lst_Append(&cgn->parents, pgn); - if (DEBUG(PARSE)) { - debug_printf("# %s: added child %s - %s\n", - __func__, pgn->name, cgn->name); - Targ_PrintNode(pgn, 0); - Targ_PrintNode(cgn, 0); - } + if (DEBUG(PARSE)) { + debug_printf("# %s: added child %s - %s\n", + __func__, pgn->name, cgn->name); + Targ_PrintNode(pgn, 0); + Targ_PrintNode(cgn, 0); + } } /* Add the node to each target from the current dependency group. */ static void LinkToTargets(GNode *gn, Boolean isSpecial) { - GNodeListNode *ln; - for (ln = targets->first; ln != NULL; ln = ln->next) - LinkSource(ln->datum, gn, isSpecial); + GNodeListNode *ln; + + for (ln = targets->first; ln != NULL; ln = ln->next) + LinkSource(ln->datum, gn, isSpecial); } static Boolean TryApplyDependencyOperator(GNode *gn, GNodeType op) { - /* - * If the node occurred on the left-hand side of a dependency and the - * operator also defines a dependency, they must match. - */ - if ((op & OP_OPMASK) && (gn->type & OP_OPMASK) && - ((op & OP_OPMASK) != (gn->type & OP_OPMASK))) - { - Parse_Error(PARSE_FATAL, "Inconsistent operator for %s", gn->name); - return FALSE; - } - - if (op == OP_DOUBLEDEP && (gn->type & OP_OPMASK) == OP_DOUBLEDEP) { /* - * If the node was of the left-hand side of a '::' operator, we need - * to create a new instance of it for the children and commands on - * this dependency line since each of these dependency groups has its - * own attributes and commands, separate from the others. - * - * The new instance is placed on the 'cohorts' list of the - * initial one (note the initial one is not on its own cohorts list) - * and the new instance is linked to all parents of the initial - * instance. + * If the node occurred on the left-hand side of a dependency and the + * operator also defines a dependency, they must match. */ - GNode *cohort; + if ((op & OP_OPMASK) && (gn->type & OP_OPMASK) && + ((op & OP_OPMASK) != (gn->type & OP_OPMASK))) { + Parse_Error(PARSE_FATAL, "Inconsistent operator for %s", + gn->name); + return FALSE; + } - /* - * Propagate copied bits to the initial node. They'll be propagated - * back to the rest of the cohorts later. - */ - gn->type |= op & ~OP_OPMASK; + if (op == OP_DOUBLEDEP && (gn->type & OP_OPMASK) == OP_DOUBLEDEP) { + /* + * If the node was of the left-hand side of a '::' operator, + * we need to create a new instance of it for the children + * and commands on this dependency line since each of these + * dependency groups has its own attributes and commands, + * separate from the others. + * + * The new instance is placed on the 'cohorts' list of the + * initial one (note the initial one is not on its own + * cohorts list) and the new instance is linked to all + * parents of the initial instance. + */ + GNode *cohort; - cohort = Targ_NewInternalNode(gn->name); - if (doing_depend) - ParseMark(cohort); - /* - * Make the cohort invisible as well to avoid duplicating it into - * other variables. True, parents of this target won't tend to do - * anything with their local variables, but better safe than - * sorry. (I think this is pointless now, since the relevant list - * traversals will no longer see this node anyway. -mycroft) - */ - cohort->type = op | OP_INVISIBLE; - Lst_Append(gn->cohorts, cohort); - cohort->centurion = gn; - gn->unmade_cohorts++; - snprintf(cohort->cohort_num, sizeof cohort->cohort_num, "#%d", - (unsigned int)gn->unmade_cohorts % 1000000); - } else { - /* - * We don't want to nuke any previous flags (whatever they were) so we - * just OR the new operator into the old. - */ - gn->type |= op; - } + /* + * Propagate copied bits to the initial node. They'll be + * propagated back to the rest of the cohorts later. + */ + gn->type |= op & ~OP_OPMASK; + + cohort = Targ_NewInternalNode(gn->name); + if (doing_depend) + ParseMark(cohort); + /* + * Make the cohort invisible as well to avoid duplicating it + * into other variables. True, parents of this target won't + * tend to do anything with their local variables, but better + * safe than sorry. + * + * (I think this is pointless now, since the relevant list + * traversals will no longer see this node anyway. -mycroft) + */ + cohort->type = op | OP_INVISIBLE; + Lst_Append(&gn->cohorts, cohort); + cohort->centurion = gn; + gn->unmade_cohorts++; + snprintf(cohort->cohort_num, sizeof cohort->cohort_num, "#%d", + (unsigned int)gn->unmade_cohorts % 1000000); + } else { + /* + * We don't want to nuke any previous flags (whatever they + * were) so we just OR the new operator into the old. + */ + gn->type |= op; + } - return TRUE; + return TRUE; } static void ApplyDependencyOperator(GNodeType op) { - GNodeListNode *ln; - for (ln = targets->first; ln != NULL; ln = ln->next) - if (!TryApplyDependencyOperator(ln->datum, op)) - break; + GNodeListNode *ln; + + for (ln = targets->first; ln != NULL; ln = ln->next) + if (!TryApplyDependencyOperator(ln->datum, op)) + break; +} + +/* + * We add a .WAIT node in the dependency list. After any dynamic dependencies + * (and filename globbing) have happened, it is given a dependency on each + * previous child, back until the previous .WAIT node. The next child won't + * be scheduled until the .WAIT node is built. + * + * We give each .WAIT node a unique name (mainly for diagnostics). + */ +static void +ParseDependencySourceWait(Boolean isSpecial) +{ + static int wait_number = 0; + char wait_src[16]; + GNode *gn; + + snprintf(wait_src, sizeof wait_src, ".WAIT_%u", ++wait_number); + gn = Targ_NewInternalNode(wait_src); + if (doing_depend) + ParseMark(gn); + gn->type = OP_WAIT | OP_PHONY | OP_DEPENDS | OP_NOTMAIN; + LinkToTargets(gn, isSpecial); + } static Boolean -ParseDoSrcKeyword(const char *src, ParseSpecial specType) +ParseDependencySourceKeyword(const char *src, ParseSpecial specType) { - static int wait_number = 0; - char wait_src[16]; - GNode *gn; + int keywd; + GNodeType op; - if (*src == '.' && ch_isupper(src[1])) { - int keywd = ParseFindKeyword(src); - if (keywd != -1) { - GNodeType op = parseKeywords[keywd].op; - if (op != 0) { + if (*src != '.' || !ch_isupper(src[1])) + return FALSE; + + keywd = ParseFindKeyword(src); + if (keywd == -1) + return FALSE; + + op = parseKeywords[keywd].op; + if (op != OP_NONE) { ApplyDependencyOperator(op); return TRUE; - } - if (parseKeywords[keywd].spec == SP_WAIT) { - /* - * We add a .WAIT node in the dependency list. - * After any dynamic dependencies (and filename globbing) - * have happened, it is given a dependency on each - * previous child, back until the previous .WAIT node. - * The next child won't be scheduled until the .WAIT node - * is built. - * We give each .WAIT node a unique name (mainly for - * diagnostics). - */ - snprintf(wait_src, sizeof wait_src, ".WAIT_%u", ++wait_number); - gn = Targ_NewInternalNode(wait_src); - if (doing_depend) - ParseMark(gn); - gn->type = OP_WAIT | OP_PHONY | OP_DEPENDS | OP_NOTMAIN; - LinkToTargets(gn, specType != SP_NOT); + } + if (parseKeywords[keywd].spec == SP_WAIT) { + ParseDependencySourceWait(specType != SP_NOT); return TRUE; - } } - } - return FALSE; + return FALSE; } static void -ParseDoSrcMain(const char *src) -{ - /* - * In a line like ".MAIN: source1 source2", it means we need to add - * the sources of said target to the list of things to create. - * - * Note that this will only be invoked if the user didn't specify a - * target on the command line. This is to allow .ifmake to succeed. - * - * XXX: Double-check all of the above comment. - */ - Lst_Append(opts.create, bmake_strdup(src)); - /* - * Add the name to the .TARGETS variable as well, so the user can - * employ that, if desired. - */ - Var_Append(".TARGETS", src, VAR_GLOBAL); +ParseDependencySourceMain(const char *src) +{ + /* + * In a line like ".MAIN: source1 source2", it means we need to add + * the sources of said target to the list of things to create. + * + * Note that this will only be invoked if the user didn't specify a + * target on the command line and the .MAIN occurs for the first time. + * + * See ParseDoDependencyTargetSpecial, branch SP_MAIN. + * See unit-tests/cond-func-make-main.mk. + */ + Lst_Append(&opts.create, bmake_strdup(src)); + /* + * Add the name to the .TARGETS variable as well, so the user can + * employ that, if desired. + */ + Var_Append(".TARGETS", src, VAR_GLOBAL); } static void -ParseDoSrcOrder(const char *src) -{ - GNode *gn; - /* - * Create proper predecessor/successor links between the previous - * source and the current one. - */ - gn = Targ_GetNode(src); - if (doing_depend) - ParseMark(gn); - if (order_pred != NULL) { - Lst_Append(order_pred->order_succ, gn); - Lst_Append(gn->order_pred, order_pred); - if (DEBUG(PARSE)) { - debug_printf("# %s: added Order dependency %s - %s\n", - __func__, order_pred->name, gn->name); - Targ_PrintNode(order_pred, 0); - Targ_PrintNode(gn, 0); +ParseDependencySourceOrder(const char *src) +{ + GNode *gn; + /* + * Create proper predecessor/successor links between the previous + * source and the current one. + */ + gn = Targ_GetNode(src); + if (doing_depend) + ParseMark(gn); + if (order_pred != NULL) { + Lst_Append(&order_pred->order_succ, gn); + Lst_Append(&gn->order_pred, order_pred); + if (DEBUG(PARSE)) { + debug_printf("# %s: added Order dependency %s - %s\n", + __func__, order_pred->name, gn->name); + Targ_PrintNode(order_pred, 0); + Targ_PrintNode(gn, 0); + } } - } - /* - * The current source now becomes the predecessor for the next one. - */ - order_pred = gn; + /* + * The current source now becomes the predecessor for the next one. + */ + order_pred = gn; } static void -ParseDoSrcOther(const char *src, GNodeType tOp, ParseSpecial specType) -{ - GNode *gn; - - /* - * If the source is not an attribute, we need to find/create - * a node for it. After that we can apply any operator to it - * from a special target or link it to its parents, as - * appropriate. - * - * In the case of a source that was the object of a :: operator, - * the attribute is applied to all of its instances (as kept in - * the 'cohorts' list of the node) or all the cohorts are linked - * to all the targets. - */ - - /* Find/create the 'src' node and attach to all targets */ - gn = Targ_GetNode(src); - if (doing_depend) - ParseMark(gn); - if (tOp != OP_NONE) - gn->type |= tOp; - else - LinkToTargets(gn, specType != SP_NOT); -} - -/* Given the name of a source in a dependency line, figure out if it is an +ParseDependencySourceOther(const char *src, GNodeType tOp, + ParseSpecial specType) +{ + GNode *gn; + + /* + * If the source is not an attribute, we need to find/create + * a node for it. After that we can apply any operator to it + * from a special target or link it to its parents, as + * appropriate. + * + * In the case of a source that was the object of a :: operator, + * the attribute is applied to all of its instances (as kept in + * the 'cohorts' list of the node) or all the cohorts are linked + * to all the targets. + */ + + /* Find/create the 'src' node and attach to all targets */ + gn = Targ_GetNode(src); + if (doing_depend) + ParseMark(gn); + if (tOp != OP_NONE) + gn->type |= tOp; + else + LinkToTargets(gn, specType != SP_NOT); +} + +/* + * Given the name of a source in a dependency line, figure out if it is an * attribute (such as .SILENT) and apply it to the targets if it is. Else * decide if there is some attribute which should be applied *to* the source * because of some special target (such as .PHONY) and apply it if so. * Otherwise, make the source a child of the targets in the list 'targets'. * * Input: * tOp operator (if any) from special targets * src name of the source to handle */ static void -ParseDoSrc(GNodeType tOp, const char *src, ParseSpecial specType) +ParseDependencySource(GNodeType tOp, const char *src, ParseSpecial specType) { - if (ParseDoSrcKeyword(src, specType)) - return; + if (ParseDependencySourceKeyword(src, specType)) + return; - if (specType == SP_MAIN) - ParseDoSrcMain(src); - else if (specType == SP_ORDER) - ParseDoSrcOrder(src); - else - ParseDoSrcOther(src, tOp, specType); + if (specType == SP_MAIN) + ParseDependencySourceMain(src); + else if (specType == SP_ORDER) + ParseDependencySourceOrder(src); + else + ParseDependencySourceOther(src, tOp, specType); } -/* If we have yet to decide on a main target to make, in the absence of any +/* + * If we have yet to decide on a main target to make, in the absence of any * user input, we want the first target on the first dependency line that is - * actually a real target (i.e. isn't a .USE or .EXEC rule) to be made. */ + * actually a real target (i.e. isn't a .USE or .EXEC rule) to be made. + */ static void FindMainTarget(void) { - GNodeListNode *ln; + GNodeListNode *ln; - if (mainNode != NULL) - return; + if (mainNode != NULL) + return; - for (ln = targets->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; - if (!(gn->type & OP_NOTARGET)) { - mainNode = gn; - Targ_SetMain(gn); - return; + for (ln = targets->first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; + if (!(gn->type & OP_NOTARGET)) { + DEBUG1(MAKE, "Setting main node to \"%s\"\n", gn->name); + mainNode = gn; + Targ_SetMain(gn); + return; + } } - } } /* * We got to the end of the line while we were still looking at targets. * * Ending a dependency line without an operator is a Bozo no-no. As a * heuristic, this is also often triggered by undetected conflicts from * cvs/rcs merges. */ static void ParseErrorNoDependency(const char *lstart) { - if ((strncmp(lstart, "<<<<<<", 6) == 0) || - (strncmp(lstart, "======", 6) == 0) || - (strncmp(lstart, ">>>>>>", 6) == 0)) - Parse_Error(PARSE_FATAL, + if ((strncmp(lstart, "<<<<<<", 6) == 0) || + (strncmp(lstart, "======", 6) == 0) || + (strncmp(lstart, ">>>>>>", 6) == 0)) + Parse_Error(PARSE_FATAL, "Makefile appears to contain unresolved cvs/rcs/??? merge conflicts"); - else if (lstart[0] == '.') { - const char *dirstart = lstart + 1; - const char *dirend; - cpp_skip_whitespace(&dirstart); - dirend = dirstart; - while (ch_isalnum(*dirend) || *dirend == '-') - dirend++; - Parse_Error(PARSE_FATAL, "Unknown directive \"%.*s\"", + else if (lstart[0] == '.') { + const char *dirstart = lstart + 1; + const char *dirend; + cpp_skip_whitespace(&dirstart); + dirend = dirstart; + while (ch_isalnum(*dirend) || *dirend == '-') + dirend++; + Parse_Error(PARSE_FATAL, "Unknown directive \"%.*s\"", (int)(dirend - dirstart), dirstart); - } else - Parse_Error(PARSE_FATAL, "Need an operator"); + } else + Parse_Error(PARSE_FATAL, "Need an operator"); } static void -ParseDependencyTargetWord(/*const*/ char **pp, const char *lstart) -{ - /*const*/ char *cp = *pp; - - while (*cp != '\0') { - if ((ch_isspace(*cp) || *cp == '!' || *cp == ':' || *cp == '(') && - !ParseIsEscaped(lstart, cp)) - break; - - if (*cp == '$') { - /* - * Must be a dynamic source (would have been expanded - * otherwise), so call the Var module to parse the puppy - * so we can safely advance beyond it...There should be - * no errors in this, as they would have been discovered - * in the initial Var_Subst and we wouldn't be here. - */ - const char *nested_p = cp; - const char *nested_val; - void *freeIt; - - (void)Var_Parse(&nested_p, VAR_CMDLINE, - VARE_WANTRES | VARE_UNDEFERR, &nested_val, &freeIt); - /* TODO: handle errors */ - free(freeIt); - cp += nested_p - cp; - } else - cp++; - } +ParseDependencyTargetWord(const char **pp, const char *lstart) +{ + const char *cp = *pp; + + while (*cp != '\0') { + if ((ch_isspace(*cp) || *cp == '!' || *cp == ':' || + *cp == '(') && + !ParseIsEscaped(lstart, cp)) + break; - *pp = cp; + if (*cp == '$') { + /* + * Must be a dynamic source (would have been expanded + * otherwise), so call the Var module to parse the + * puppy so we can safely advance beyond it. + * + * There should be no errors in this, as they would + * have been discovered in the initial Var_Subst and + * we wouldn't be here. + */ + const char *nested_p = cp; + FStr nested_val; + + (void)Var_Parse(&nested_p, VAR_CMDLINE, VARE_NONE, + &nested_val); + /* TODO: handle errors */ + FStr_Done(&nested_val); + cp += nested_p - cp; + } else + cp++; + } + + *pp = cp; } /* Handle special targets like .PATH, .DEFAULT, .BEGIN, .ORDER. */ static void ParseDoDependencyTargetSpecial(ParseSpecial *inout_specType, - const char *line, + const char *line, /* XXX: bad name */ SearchPathList **inout_paths) { - switch (*inout_specType) { - case SP_PATH: - if (*inout_paths == NULL) - *inout_paths = Lst_New(); - Lst_Append(*inout_paths, dirSearchPath); - break; - case SP_MAIN: - /* Allow targets from the command line to override the .MAIN node. */ - if (!Lst_IsEmpty(opts.create)) - *inout_specType = SP_NOT; - break; - case SP_BEGIN: - case SP_END: - case SP_STALE: - case SP_ERROR: - case SP_INTERRUPT: { - GNode *gn = Targ_GetNode(line); - if (doing_depend) - ParseMark(gn); - gn->type |= OP_NOTMAIN|OP_SPECIAL; - Lst_Append(targets, gn); - break; - } - case SP_DEFAULT: { - /* Need to create a node to hang commands on, but we don't want it - * in the graph, nor do we want it to be the Main Target. We claim - * the node is a transformation rule to make life easier later, - * when we'll use Make_HandleUse to actually apply the .DEFAULT - * commands. */ - GNode *gn = GNode_New(".DEFAULT"); - gn->type |= OP_NOTMAIN|OP_TRANSFORM; - Lst_Append(targets, gn); - defaultNode = gn; - break; - } - case SP_DELETE_ON_ERROR: - deleteOnError = TRUE; - break; - case SP_NOTPARALLEL: - opts.maxJobs = 1; - break; - case SP_SINGLESHELL: - opts.compatMake = TRUE; - break; - case SP_ORDER: - order_pred = NULL; - break; - default: - break; - } + switch (*inout_specType) { + case SP_PATH: + if (*inout_paths == NULL) + *inout_paths = Lst_New(); + Lst_Append(*inout_paths, &dirSearchPath); + break; + case SP_MAIN: + /* + * Allow targets from the command line to override the + * .MAIN node. + */ + if (!Lst_IsEmpty(&opts.create)) + *inout_specType = SP_NOT; + break; + case SP_BEGIN: + case SP_END: + case SP_STALE: + case SP_ERROR: + case SP_INTERRUPT: { + GNode *gn = Targ_GetNode(line); + if (doing_depend) + ParseMark(gn); + gn->type |= OP_NOTMAIN | OP_SPECIAL; + Lst_Append(targets, gn); + break; + } + case SP_DEFAULT: { + /* + * Need to create a node to hang commands on, but we don't + * want it in the graph, nor do we want it to be the Main + * Target. We claim the node is a transformation rule to make + * life easier later, when we'll use Make_HandleUse to + * actually apply the .DEFAULT commands. + */ + GNode *gn = GNode_New(".DEFAULT"); + gn->type |= OP_NOTMAIN | OP_TRANSFORM; + Lst_Append(targets, gn); + defaultNode = gn; + break; + } + case SP_DELETE_ON_ERROR: + deleteOnError = TRUE; + break; + case SP_NOTPARALLEL: + opts.maxJobs = 1; + break; + case SP_SINGLESHELL: + opts.compatMake = TRUE; + break; + case SP_ORDER: + order_pred = NULL; + break; + default: + break; + } } /* * .PATH has to be handled specially. * Call on the suffix module to give us a path to modify. */ static Boolean -ParseDoDependencyTargetPath(const char *line, SearchPathList **inout_paths) +ParseDoDependencyTargetPath(const char *line, /* XXX: bad name */ + SearchPathList **inout_paths) { - SearchPath *path; + SearchPath *path; - path = Suff_GetPath(&line[5]); - if (path == NULL) { - Parse_Error(PARSE_FATAL, - "Suffix '%s' not defined (yet)", - &line[5]); - return FALSE; - } + path = Suff_GetPath(&line[5]); + if (path == NULL) { + Parse_Error(PARSE_FATAL, + "Suffix '%s' not defined (yet)", &line[5]); + return FALSE; + } - if (*inout_paths == NULL) - *inout_paths = Lst_New(); - Lst_Append(*inout_paths, path); + if (*inout_paths == NULL) + *inout_paths = Lst_New(); + Lst_Append(*inout_paths, path); - return TRUE; + return TRUE; } /* * See if it's a special target and if so set specType to match it. */ static Boolean -ParseDoDependencyTarget(const char *line, ParseSpecial *inout_specType, +ParseDoDependencyTarget(const char *line, /* XXX: bad name */ + ParseSpecial *inout_specType, GNodeType *out_tOp, SearchPathList **inout_paths) { - int keywd; + int keywd; - if (!(*line == '.' && ch_isupper(line[1]))) - return TRUE; + if (!(line[0] == '.' && ch_isupper(line[1]))) + return TRUE; - /* - * See if the target is a special target that must have it - * or its sources handled specially. - */ - keywd = ParseFindKeyword(line); - if (keywd != -1) { - if (*inout_specType == SP_PATH && parseKeywords[keywd].spec != SP_PATH) { - Parse_Error(PARSE_FATAL, "Mismatched special targets"); - return FALSE; - } + /* + * See if the target is a special target that must have it + * or its sources handled specially. + */ + keywd = ParseFindKeyword(line); + if (keywd != -1) { + if (*inout_specType == SP_PATH && + parseKeywords[keywd].spec != SP_PATH) { + Parse_Error(PARSE_FATAL, "Mismatched special targets"); + return FALSE; + } - *inout_specType = parseKeywords[keywd].spec; - *out_tOp = parseKeywords[keywd].op; + *inout_specType = parseKeywords[keywd].spec; + *out_tOp = parseKeywords[keywd].op; - ParseDoDependencyTargetSpecial(inout_specType, line, inout_paths); + ParseDoDependencyTargetSpecial(inout_specType, line, + inout_paths); - } else if (strncmp(line, ".PATH", 5) == 0) { - *inout_specType = SP_PATH; - if (!ParseDoDependencyTargetPath(line, inout_paths)) - return FALSE; - } - return TRUE; + } else if (strncmp(line, ".PATH", 5) == 0) { + *inout_specType = SP_PATH; + if (!ParseDoDependencyTargetPath(line, inout_paths)) + return FALSE; + } + return TRUE; } static void -ParseDoDependencyTargetMundane(char *line, StringList *curTargs) +ParseDoDependencyTargetMundane(char *line, /* XXX: bad name */ + StringList *curTargs) { - if (Dir_HasWildcards(line)) { - /* - * Targets are to be sought only in the current directory, - * so create an empty path for the thing. Note we need to - * use Dir_Destroy in the destruction of the path as the - * Dir module could have added a directory to the path... - */ - SearchPath *emptyPath = Lst_New(); + if (Dir_HasWildcards(line)) { + /* + * Targets are to be sought only in the current directory, + * so create an empty path for the thing. Note we need to + * use Dir_Destroy in the destruction of the path as the + * Dir module could have added a directory to the path... + */ + SearchPath *emptyPath = SearchPath_New(); - Dir_Expand(line, emptyPath, curTargs); + Dir_Expand(line, emptyPath, curTargs); - Lst_Destroy(emptyPath, Dir_Destroy); - } else { - /* - * No wildcards, but we want to avoid code duplication, - * so create a list with the word on it. - */ - Lst_Append(curTargs, line); - } + SearchPath_Free(emptyPath); + } else { + /* + * No wildcards, but we want to avoid code duplication, + * so create a list with the word on it. + */ + Lst_Append(curTargs, line); + } - /* Apply the targets. */ + /* Apply the targets. */ - while (!Lst_IsEmpty(curTargs)) { - char *targName = Lst_Dequeue(curTargs); - GNode *gn = Suff_IsTransform(targName) + while (!Lst_IsEmpty(curTargs)) { + char *targName = Lst_Dequeue(curTargs); + GNode *gn = Suff_IsTransform(targName) ? Suff_AddTransform(targName) : Targ_GetNode(targName); - if (doing_depend) - ParseMark(gn); + if (doing_depend) + ParseMark(gn); - Lst_Append(targets, gn); - } + Lst_Append(targets, gn); + } } static void ParseDoDependencyTargetExtraWarn(char **pp, const char *lstart) { - Boolean warning = FALSE; - char *cp = *pp; + Boolean warning = FALSE; + char *cp = *pp; - while (*cp != '\0') { - if (!ParseIsEscaped(lstart, cp) && (*cp == '!' || *cp == ':')) - break; - if (ParseIsEscaped(lstart, cp) || (*cp != ' ' && *cp != '\t')) - warning = TRUE; - cp++; - } - if (warning) - Parse_Error(PARSE_WARNING, "Extra target ignored"); + while (*cp != '\0') { + if (!ParseIsEscaped(lstart, cp) && (*cp == '!' || *cp == ':')) + break; + if (ParseIsEscaped(lstart, cp) || (*cp != ' ' && *cp != '\t')) + warning = TRUE; + cp++; + } + if (warning) + Parse_Error(PARSE_WARNING, "Extra target ignored"); - *pp = cp; + *pp = cp; } static void ParseDoDependencyCheckSpec(ParseSpecial specType) { - switch (specType) { - default: - Parse_Error(PARSE_WARNING, + switch (specType) { + default: + Parse_Error(PARSE_WARNING, "Special and mundane targets don't mix. " "Mundane ones ignored"); - break; - case SP_DEFAULT: - case SP_STALE: - case SP_BEGIN: - case SP_END: - case SP_ERROR: - case SP_INTERRUPT: - /* - * These create nodes on which to hang commands, so targets - * shouldn't be empty... - */ - case SP_NOT: - /* Nothing special here -- targets can be empty if it wants. */ - break; - } + break; + case SP_DEFAULT: + case SP_STALE: + case SP_BEGIN: + case SP_END: + case SP_ERROR: + case SP_INTERRUPT: + /* + * These create nodes on which to hang commands, so targets + * shouldn't be empty. + */ + case SP_NOT: + /* Nothing special here -- targets can be empty if it wants. */ + break; + } } static Boolean ParseDoDependencyParseOp(char **pp, const char *lstart, GNodeType *out_op) { - const char *cp = *pp; + const char *cp = *pp; - if (*cp == '!') { - *out_op = OP_FORCE; - (*pp)++; - return TRUE; - } + if (*cp == '!') { + *out_op = OP_FORCE; + (*pp)++; + return TRUE; + } - if (*cp == ':') { - if (cp[1] == ':') { - *out_op = OP_DOUBLEDEP; - (*pp) += 2; - } else { - *out_op = OP_DEPENDS; - (*pp)++; + if (*cp == ':') { + if (cp[1] == ':') { + *out_op = OP_DOUBLEDEP; + (*pp) += 2; + } else { + *out_op = OP_DEPENDS; + (*pp)++; + } + return TRUE; } - return TRUE; - } - { - const char *msg = lstart[0] == '.' ? "Unknown directive" - : "Missing dependency operator"; - Parse_Error(PARSE_FATAL, "%s", msg); - return FALSE; - } + { + const char *msg = lstart[0] == '.' + ? "Unknown directive" : "Missing dependency operator"; + Parse_Error(PARSE_FATAL, "%s", msg); + return FALSE; + } } static void ClearPaths(SearchPathList *paths) { - if (paths != NULL) { - SearchPathListNode *ln; - for (ln = paths->first; ln != NULL; ln = ln->next) - Dir_ClearPath(ln->datum); - } + if (paths != NULL) { + SearchPathListNode *ln; + for (ln = paths->first; ln != NULL; ln = ln->next) + SearchPath_Clear(ln->datum); + } - Dir_SetPATH(); + Dir_SetPATH(); } static void ParseDoDependencySourcesEmpty(ParseSpecial specType, SearchPathList *paths) { - switch (specType) { - case SP_SUFFIXES: - Suff_ClearSuffixes(); - break; - case SP_PRECIOUS: - allPrecious = TRUE; - break; - case SP_IGNORE: - opts.ignoreErrors = TRUE; - break; - case SP_SILENT: - opts.beSilent = TRUE; - break; - case SP_PATH: - ClearPaths(paths); - break; + switch (specType) { + case SP_SUFFIXES: + Suff_ClearSuffixes(); + break; + case SP_PRECIOUS: + allPrecious = TRUE; + break; + case SP_IGNORE: + opts.ignoreErrors = TRUE; + break; + case SP_SILENT: + opts.beSilent = TRUE; + break; + case SP_PATH: + ClearPaths(paths); + break; #ifdef POSIX - case SP_POSIX: - Var_Set("%POSIX", "1003.2", VAR_GLOBAL); - break; + case SP_POSIX: + Var_Set("%POSIX", "1003.2", VAR_GLOBAL); + break; #endif - default: - break; - } + default: + break; + } } static void AddToPaths(const char *dir, SearchPathList *paths) { - if (paths != NULL) { - SearchPathListNode *ln; - for (ln = paths->first; ln != NULL; ln = ln->next) - (void)Dir_AddDir(ln->datum, dir); - } + if (paths != NULL) { + SearchPathListNode *ln; + for (ln = paths->first; ln != NULL; ln = ln->next) + (void)Dir_AddDir(ln->datum, dir); + } } /* * If the target was one that doesn't take files as its sources * but takes something like suffixes, we take each * space-separated word on the line as a something and deal * with it accordingly. * * If the target was .SUFFIXES, we take each source as a * suffix and add it to the list of suffixes maintained by the * Suff module. * * If the target was a .PATH, we add the source as a directory * to search on the search path. * * If it was .INCLUDES, the source is taken to be the suffix of * files which will be #included and whose search path should * be present in the .INCLUDES variable. * * If it was .LIBS, the source is taken to be the suffix of * files which are considered libraries and whose search path * should be present in the .LIBS variable. * * If it was .NULL, the source is the suffix to use when a file * has no valid suffix. * * If it was .OBJDIR, the source is a new definition for .OBJDIR, * and will cause make to do a new chdir to that path. */ static void ParseDoDependencySourceSpecial(ParseSpecial specType, char *word, SearchPathList *paths) { - switch (specType) { - case SP_SUFFIXES: - Suff_AddSuffix(word, &mainNode); - break; - case SP_PATH: - AddToPaths(word, paths); - break; - case SP_INCLUDES: - Suff_AddInclude(word); - break; - case SP_LIBS: - Suff_AddLib(word); - break; - case SP_NULL: - Suff_SetNull(word); - break; - case SP_OBJDIR: - Main_SetObjdir(FALSE, "%s", word); - break; - default: - break; - } + switch (specType) { + case SP_SUFFIXES: + Suff_AddSuffix(word, &mainNode); + break; + case SP_PATH: + AddToPaths(word, paths); + break; + case SP_INCLUDES: + Suff_AddInclude(word); + break; + case SP_LIBS: + Suff_AddLib(word); + break; + case SP_NULL: + Suff_SetNull(word); + break; + case SP_OBJDIR: + Main_SetObjdir(FALSE, "%s", word); + break; + default: + break; + } } static Boolean ParseDoDependencyTargets(char **inout_cp, char **inout_line, const char *lstart, ParseSpecial *inout_specType, GNodeType *inout_tOp, SearchPathList **inout_paths, StringList *curTargs) { - char *cp = *inout_cp; - char *line = *inout_line; - char savec; + char *cp; + char *tgt = *inout_line; + char savec; + const char *p; - for (;;) { - /* - * Here LINE points to the beginning of the next word, and - * LSTART points to the actual beginning of the line. - */ + for (;;) { + /* + * Here LINE points to the beginning of the next word, and + * LSTART points to the actual beginning of the line. + */ - /* Find the end of the next word. */ - cp = line; - ParseDependencyTargetWord(&cp, lstart); + /* Find the end of the next word. */ + cp = tgt; + p = cp; + ParseDependencyTargetWord(&p, lstart); + cp += p - cp; - /* - * If the word is followed by a left parenthesis, it's the - * name of an object file inside an archive (ar file). - */ - if (!ParseIsEscaped(lstart, cp) && *cp == '(') { - /* - * Archives must be handled specially to make sure the OP_ARCHV - * flag is set in their 'type' field, for one thing, and because - * things like "archive(file1.o file2.o file3.o)" are permissible. - * Arch_ParseArchive will set 'line' to be the first non-blank - * after the archive-spec. It creates/finds nodes for the members - * and places them on the given list, returning TRUE if all - * went well and FALSE if there was an error in the - * specification. On error, line should remain untouched. - */ - if (!Arch_ParseArchive(&line, targets, VAR_CMDLINE)) { - Parse_Error(PARSE_FATAL, - "Error in archive specification: \"%s\"", line); - return FALSE; - } else { - /* Done with this word; on to the next. */ - cp = line; - continue; - } - } + /* + * If the word is followed by a left parenthesis, it's the + * name of an object file inside an archive (ar file). + */ + if (!ParseIsEscaped(lstart, cp) && *cp == '(') { + /* + * Archives must be handled specially to make sure the + * OP_ARCHV flag is set in their 'type' field, for one + * thing, and because things like "archive(file1.o + * file2.o file3.o)" are permissible. + * + * Arch_ParseArchive will set 'line' to be the first + * non-blank after the archive-spec. It creates/finds + * nodes for the members and places them on the given + * list, returning TRUE if all went well and FALSE if + * there was an error in the specification. On error, + * line should remain untouched. + */ + if (!Arch_ParseArchive(&tgt, targets, VAR_CMDLINE)) { + Parse_Error(PARSE_FATAL, + "Error in archive specification: \"%s\"", + tgt); + return FALSE; + } - if (!*cp) { - ParseErrorNoDependency(lstart); - return FALSE; - } + cp = tgt; + continue; + } - /* Insert a null terminator. */ - savec = *cp; - *cp = '\0'; + if (*cp == '\0') { + ParseErrorNoDependency(lstart); + return FALSE; + } - if (!ParseDoDependencyTarget(line, inout_specType, inout_tOp, - inout_paths)) - return FALSE; + /* Insert a null terminator. */ + savec = *cp; + *cp = '\0'; - /* - * Have word in line. Get or create its node and stick it at - * the end of the targets list - */ - if (*inout_specType == SP_NOT && *line != '\0') - ParseDoDependencyTargetMundane(line, curTargs); - else if (*inout_specType == SP_PATH && *line != '.' && *line != '\0') - Parse_Error(PARSE_WARNING, "Extra target (%s) ignored", line); + if (!ParseDoDependencyTarget(tgt, inout_specType, inout_tOp, + inout_paths)) + return FALSE; - /* Don't need the inserted null terminator any more. */ - *cp = savec; + /* + * Have word in line. Get or create its node and stick it at + * the end of the targets list + */ + if (*inout_specType == SP_NOT && *tgt != '\0') + ParseDoDependencyTargetMundane(tgt, curTargs); + else if (*inout_specType == SP_PATH && *tgt != '.' && + *tgt != '\0') + Parse_Error(PARSE_WARNING, "Extra target (%s) ignored", + tgt); - /* - * If it is a special type and not .PATH, it's the only target we - * allow on this line... - */ - if (*inout_specType != SP_NOT && *inout_specType != SP_PATH) - ParseDoDependencyTargetExtraWarn(&cp, lstart); - else - pp_skip_whitespace(&cp); + /* Don't need the inserted null terminator any more. */ + *cp = savec; - line = cp; - if (*line == '\0') - break; - if ((*line == '!' || *line == ':') && !ParseIsEscaped(lstart, line)) - break; - } + /* + * If it is a special type and not .PATH, it's the only target + * we allow on this line. + */ + if (*inout_specType != SP_NOT && *inout_specType != SP_PATH) + ParseDoDependencyTargetExtraWarn(&cp, lstart); + else + pp_skip_whitespace(&cp); - *inout_cp = cp; - *inout_line = line; - return TRUE; + tgt = cp; + if (*tgt == '\0') + break; + if ((*tgt == '!' || *tgt == ':') && + !ParseIsEscaped(lstart, tgt)) + break; + } + + *inout_cp = cp; + *inout_line = tgt; + return TRUE; } static void ParseDoDependencySourcesSpecial(char *start, char *end, ParseSpecial specType, SearchPathList *paths) { - char savec; + char savec; - while (*start) { - while (*end && !ch_isspace(*end)) - end++; - savec = *end; - *end = '\0'; - ParseDoDependencySourceSpecial(specType, start, paths); - *end = savec; - if (savec != '\0') - end++; - pp_skip_whitespace(&end); - start = end; - } + while (*start != '\0') { + while (*end != '\0' && !ch_isspace(*end)) + end++; + savec = *end; + *end = '\0'; + ParseDoDependencySourceSpecial(specType, start, paths); + *end = savec; + if (savec != '\0') + end++; + pp_skip_whitespace(&end); + start = end; + } } static Boolean ParseDoDependencySourcesMundane(char *start, char *end, ParseSpecial specType, GNodeType tOp) { - while (*start != '\0') { - /* - * The targets take real sources, so we must beware of archive - * specifications (i.e. things with left parentheses in them) - * and handle them accordingly. - */ - for (; *end && !ch_isspace(*end); end++) { - if (*end == '(' && end > start && end[-1] != '$') { + while (*start != '\0') { /* - * Only stop for a left parenthesis if it isn't at the - * start of a word (that'll be for variable changes - * later) and isn't preceded by a dollar sign (a dynamic - * source). + * The targets take real sources, so we must beware of archive + * specifications (i.e. things with left parentheses in them) + * and handle them accordingly. */ - break; - } - } + for (; *end != '\0' && !ch_isspace(*end); end++) { + if (*end == '(' && end > start && end[-1] != '$') { + /* + * Only stop for a left parenthesis if it + * isn't at the start of a word (that'll be + * for variable changes later) and isn't + * preceded by a dollar sign (a dynamic + * source). + */ + break; + } + } - if (*end == '(') { - GNodeList *sources = Lst_New(); - if (!Arch_ParseArchive(&start, sources, VAR_CMDLINE)) { - Parse_Error(PARSE_FATAL, - "Error in source archive spec \"%s\"", start); - return FALSE; - } - - while (!Lst_IsEmpty(sources)) { - GNode *gn = Lst_Dequeue(sources); - ParseDoSrc(tOp, gn->name, specType); - } - Lst_Free(sources); - end = start; - } else { - if (*end) { - *end = '\0'; - end++; - } + if (*end == '(') { + GNodeList sources = LST_INIT; + if (!Arch_ParseArchive(&start, &sources, VAR_CMDLINE)) { + Parse_Error(PARSE_FATAL, + "Error in source archive spec \"%s\"", + start); + return FALSE; + } + + while (!Lst_IsEmpty(&sources)) { + GNode *gn = Lst_Dequeue(&sources); + ParseDependencySource(tOp, gn->name, specType); + } + Lst_Done(&sources); + end = start; + } else { + if (*end != '\0') { + *end = '\0'; + end++; + } - ParseDoSrc(tOp, start, specType); + ParseDependencySource(tOp, start, specType); + } + pp_skip_whitespace(&end); + start = end; } - pp_skip_whitespace(&end); - start = end; - } - return TRUE; + return TRUE; } -/* Parse a dependency line consisting of targets, followed by a dependency +/* + * Parse a dependency line consisting of targets, followed by a dependency * operator, optionally followed by sources. * * The nodes of the sources are linked as children to the nodes of the * targets. Nodes are created as necessary. * * The operator is applied to each node in the global 'targets' list, * which is where the nodes found for the targets are kept, by means of * the ParseDoOp function. * * The sources are parsed in much the same way as the targets, except * that they are expanded using the wildcarding scheme of the C-Shell, * and a target is created for each expanded word. Each of the resulting * nodes is then linked to each of the targets as one of its children. * * Certain targets and sources such as .PHONY or .PRECIOUS are handled * specially. These are the ones detailed by the specType variable. * * The storing of transformation rules such as '.c.o' is also taken care of * here. A target is recognized as a transformation rule by calling * Suff_IsTransform. If it is a transformation rule, its node is gotten * from the suffix module via Suff_AddTransform rather than the standard * Targ_FindNode in the target module. * * Upon return, the value of the line is unspecified. */ static void ParseDoDependency(char *line) { - char *cp; /* our current position */ - GNodeType op; /* the operator on the line */ - SearchPathList *paths; /* search paths to alter when parsing + char *cp; /* our current position */ + GNodeType op; /* the operator on the line */ + SearchPathList *paths; /* search paths to alter when parsing * a list of .PATH targets */ - GNodeType tOp; /* operator from special target */ - StringList *curTargs; /* target names to be found and added - * to the targets list */ - char *lstart = line; - - /* - * specType contains the SPECial TYPE of the current target. It is SP_NOT - * if the target is unspecial. If it *is* special, however, the children - * are linked as children of the parent but not vice versa. - */ - ParseSpecial specType = SP_NOT; - - DEBUG1(PARSE, "ParseDoDependency(%s)\n", line); - tOp = OP_NONE; - - paths = NULL; - - curTargs = Lst_New(); - - /* - * First, grind through the targets. - */ - if (!ParseDoDependencyTargets(&cp, &line, lstart, &specType, &tOp, &paths, - curTargs)) - goto out; - - /* Don't need the list of target names anymore. - * The targets themselves are now in the global variable 'targets'. */ - Lst_Free(curTargs); - curTargs = NULL; - - if (!Lst_IsEmpty(targets)) - ParseDoDependencyCheckSpec(specType); - - /* - * Have now parsed all the target names. Must parse the operator next. - */ - if (!ParseDoDependencyParseOp(&cp, lstart, &op)) - goto out; - - /* - * Apply the operator to the target. This is how we remember which - * operator a target was defined with. It fails if the operator - * used isn't consistent across all references. - */ - ApplyDependencyOperator(op); - - /* - * Onward to the sources. - * - * LINE will now point to the first source word, if any, or the - * end of the string if not. - */ - pp_skip_whitespace(&cp); - line = cp; /* XXX: 'line' is an inappropriate name */ - - /* - * Several special targets take different actions if present with no - * sources: - * a .SUFFIXES line with no sources clears out all old suffixes - * a .PRECIOUS line makes all targets precious - * a .IGNORE line ignores errors for all targets - * a .SILENT line creates silence when making all targets - * a .PATH removes all directories from the search path(s). - */ - if (line[0] == '\0') { - ParseDoDependencySourcesEmpty(specType, paths); - } else if (specType == SP_MFLAGS) { + GNodeType tOp; /* operator from special target */ + /* target names to be found and added to the targets list */ + StringList curTargs = LST_INIT; + char *lstart = line; + + /* + * specType contains the SPECial TYPE of the current target. It is + * SP_NOT if the target is unspecial. If it *is* special, however, the + * children are linked as children of the parent but not vice versa. + */ + ParseSpecial specType = SP_NOT; + + DEBUG1(PARSE, "ParseDoDependency(%s)\n", line); + tOp = OP_NONE; + + paths = NULL; + + /* + * First, grind through the targets. + */ + /* XXX: don't use line as an iterator variable */ + if (!ParseDoDependencyTargets(&cp, &line, lstart, &specType, &tOp, + &paths, &curTargs)) + goto out; + /* - * Call on functions in main.c to deal with these arguments and - * set the initial character to a null-character so the loop to - * get sources won't get anything + * Don't need the list of target names anymore. + * The targets themselves are now in the global variable 'targets'. */ - Main_ParseArgLine(line); - *line = '\0'; - } else if (specType == SP_SHELL) { - if (!Job_ParseShell(line)) { - Parse_Error(PARSE_FATAL, "improper shell specification"); - goto out; - } - *line = '\0'; - } else if (specType == SP_NOTPARALLEL || specType == SP_SINGLESHELL || - specType == SP_DELETE_ON_ERROR) { - *line = '\0'; - } - - /* Now go for the sources. */ - if (specType == SP_SUFFIXES || specType == SP_PATH || - specType == SP_INCLUDES || specType == SP_LIBS || - specType == SP_NULL || specType == SP_OBJDIR) - { - ParseDoDependencySourcesSpecial(line, cp, specType, paths); - if (paths) { - Lst_Free(paths); - paths = NULL; - } - if (specType == SP_PATH) - Dir_SetPATH(); - } else { - assert(paths == NULL); - if (!ParseDoDependencySourcesMundane(line, cp, specType, tOp)) - goto out; - } - - FindMainTarget(); + Lst_Done(&curTargs); + Lst_Init(&curTargs); + + if (!Lst_IsEmpty(targets)) + ParseDoDependencyCheckSpec(specType); + + /* + * Have now parsed all the target names. Must parse the operator next. + */ + if (!ParseDoDependencyParseOp(&cp, lstart, &op)) + goto out; + + /* + * Apply the operator to the target. This is how we remember which + * operator a target was defined with. It fails if the operator + * used isn't consistent across all references. + */ + ApplyDependencyOperator(op); + + /* + * Onward to the sources. + * + * LINE will now point to the first source word, if any, or the + * end of the string if not. + */ + pp_skip_whitespace(&cp); + line = cp; /* XXX: 'line' is an inappropriate name */ + + /* + * Several special targets take different actions if present with no + * sources: + * a .SUFFIXES line with no sources clears out all old suffixes + * a .PRECIOUS line makes all targets precious + * a .IGNORE line ignores errors for all targets + * a .SILENT line creates silence when making all targets + * a .PATH removes all directories from the search path(s). + */ + if (line[0] == '\0') { + ParseDoDependencySourcesEmpty(specType, paths); + } else if (specType == SP_MFLAGS) { + /* + * Call on functions in main.c to deal with these arguments and + * set the initial character to a null-character so the loop to + * get sources won't get anything + */ + Main_ParseArgLine(line); + *line = '\0'; + } else if (specType == SP_SHELL) { + if (!Job_ParseShell(line)) { + Parse_Error(PARSE_FATAL, + "improper shell specification"); + goto out; + } + *line = '\0'; + } else if (specType == SP_NOTPARALLEL || specType == SP_SINGLESHELL || + specType == SP_DELETE_ON_ERROR) { + *line = '\0'; + } + + /* Now go for the sources. */ + if (specType == SP_SUFFIXES || specType == SP_PATH || + specType == SP_INCLUDES || specType == SP_LIBS || + specType == SP_NULL || specType == SP_OBJDIR) { + ParseDoDependencySourcesSpecial(line, cp, specType, paths); + if (paths != NULL) { + Lst_Free(paths); + paths = NULL; + } + if (specType == SP_PATH) + Dir_SetPATH(); + } else { + assert(paths == NULL); + if (!ParseDoDependencySourcesMundane(line, cp, specType, tOp)) + goto out; + } + + FindMainTarget(); out: - if (paths != NULL) - Lst_Free(paths); - if (curTargs != NULL) - Lst_Free(curTargs); + if (paths != NULL) + Lst_Free(paths); + Lst_Done(&curTargs); } typedef struct VarAssignParsed { - const char *nameStart; /* unexpanded */ - const char *nameEnd; /* before operator adjustment */ - const char *eq; /* the '=' of the assignment operator */ + const char *nameStart; /* unexpanded */ + const char *nameEnd; /* before operator adjustment */ + const char *eq; /* the '=' of the assignment operator */ } VarAssignParsed; -/* Determine the assignment operator and adjust the end of the variable - * name accordingly. */ +/* + * Determine the assignment operator and adjust the end of the variable + * name accordingly. + */ static void AdjustVarassignOp(const VarAssignParsed *pvar, const char *value, VarAssign *out_var) { - const char *op = pvar->eq; - const char * const name = pvar->nameStart; - VarAssignOp type; + const char *op = pvar->eq; + const char *const name = pvar->nameStart; + VarAssignOp type; - if (op > name && op[-1] == '+') { - type = VAR_APPEND; - op--; + if (op > name && op[-1] == '+') { + type = VAR_APPEND; + op--; - } else if (op > name && op[-1] == '?') { - op--; - type = VAR_DEFAULT; + } else if (op > name && op[-1] == '?') { + op--; + type = VAR_DEFAULT; - } else if (op > name && op[-1] == ':') { - op--; - type = VAR_SUBST; + } else if (op > name && op[-1] == ':') { + op--; + type = VAR_SUBST; - } else if (op > name && op[-1] == '!') { - op--; - type = VAR_SHELL; + } else if (op > name && op[-1] == '!') { + op--; + type = VAR_SHELL; - } else { - type = VAR_NORMAL; + } else { + type = VAR_NORMAL; #ifdef SUNSHCMD - while (op > name && ch_isspace(op[-1])) - op--; + while (op > name && ch_isspace(op[-1])) + op--; - if (op >= name + 3 && op[-3] == ':' && op[-2] == 's' && op[-1] == 'h') { - type = VAR_SHELL; - op -= 3; - } + if (op >= name + 3 && op[-3] == ':' && op[-2] == 's' && + op[-1] == 'h') { + type = VAR_SHELL; + op -= 3; + } #endif - } + } - { - const char *nameEnd = pvar->nameEnd < op ? pvar->nameEnd : op; - out_var->varname = bmake_strsedup(pvar->nameStart, nameEnd); - out_var->op = type; - out_var->value = value; - } + { + const char *nameEnd = pvar->nameEnd < op ? pvar->nameEnd : op; + out_var->varname = bmake_strsedup(pvar->nameStart, nameEnd); + out_var->op = type; + out_var->value = value; + } } -/* Parse a variable assignment, consisting of a single-word variable name, +/* + * Parse a variable assignment, consisting of a single-word variable name, * optional whitespace, an assignment operator, optional whitespace and the * variable value. * * Note: There is a lexical ambiguity with assignment modifier characters * in variable names. This routine interprets the character before the = * as a modifier. Therefore, an assignment like * C++=/usr/bin/CC * is interpreted as "C+ +=" instead of "C++ =". * - * Used for both lines in a file and command line arguments. */ + * Used for both lines in a file and command line arguments. + */ Boolean Parse_IsVar(const char *p, VarAssign *out_var) { - VarAssignParsed pvar; - const char *firstSpace = NULL; - int level = 0; + VarAssignParsed pvar; + const char *firstSpace = NULL; + int level = 0; - cpp_skip_hspace(&p); /* Skip to variable name */ + cpp_skip_hspace(&p); /* Skip to variable name */ - /* During parsing, the '+' of the '+=' operator is initially parsed - * as part of the variable name. It is later corrected, as is the ':sh' - * modifier. Of these two (nameEnd and op), the earlier one determines the - * actual end of the variable name. */ - pvar.nameStart = p; + /* + * During parsing, the '+' of the '+=' operator is initially parsed + * as part of the variable name. It is later corrected, as is the + * ':sh' modifier. Of these two (nameEnd and op), the earlier one + * determines the actual end of the variable name. + */ + pvar.nameStart = p; #ifdef CLEANUP - pvar.nameEnd = NULL; - pvar.eq = NULL; + pvar.nameEnd = NULL; + pvar.eq = NULL; #endif - /* Scan for one of the assignment operators outside a variable expansion */ - while (*p != '\0') { - char ch = *p++; - if (ch == '(' || ch == '{') { - level++; - continue; - } - if (ch == ')' || ch == '}') { - level--; - continue; - } + /* + * Scan for one of the assignment operators outside a variable + * expansion. + */ + while (*p != '\0') { + char ch = *p++; + if (ch == '(' || ch == '{') { + level++; + continue; + } + if (ch == ')' || ch == '}') { + level--; + continue; + } - if (level != 0) - continue; + if (level != 0) + continue; - if (ch == ' ' || ch == '\t') - if (firstSpace == NULL) - firstSpace = p - 1; - while (ch == ' ' || ch == '\t') - ch = *p++; + if (ch == ' ' || ch == '\t') + if (firstSpace == NULL) + firstSpace = p - 1; + while (ch == ' ' || ch == '\t') + ch = *p++; #ifdef SUNSHCMD - if (ch == ':' && p[0] == 's' && p[1] == 'h') { - p += 2; - continue; - } + if (ch == ':' && p[0] == 's' && p[1] == 'h') { + p += 2; + continue; + } #endif - if (ch == '=') { - pvar.eq = p - 1; - pvar.nameEnd = firstSpace != NULL ? firstSpace : p - 1; - cpp_skip_whitespace(&p); - AdjustVarassignOp(&pvar, p, out_var); - return TRUE; - } - if (*p == '=' && (ch == '+' || ch == ':' || ch == '?' || ch == '!')) { - pvar.eq = p; - pvar.nameEnd = firstSpace != NULL ? firstSpace : p; - p++; - cpp_skip_whitespace(&p); - AdjustVarassignOp(&pvar, p, out_var); - return TRUE; + if (ch == '=') { + pvar.eq = p - 1; + pvar.nameEnd = firstSpace != NULL ? firstSpace : p - 1; + cpp_skip_whitespace(&p); + AdjustVarassignOp(&pvar, p, out_var); + return TRUE; + } + if (*p == '=' && + (ch == '+' || ch == ':' || ch == '?' || ch == '!')) { + pvar.eq = p; + pvar.nameEnd = firstSpace != NULL ? firstSpace : p; + p++; + cpp_skip_whitespace(&p); + AdjustVarassignOp(&pvar, p, out_var); + return TRUE; + } + if (firstSpace != NULL) + return FALSE; } - if (firstSpace != NULL) - return FALSE; - } - return FALSE; + return FALSE; } +/* + * Check for syntax errors such as unclosed expressions or unknown modifiers. + */ static void VarCheckSyntax(VarAssignOp type, const char *uvalue, GNode *ctxt) { - if (opts.lint) { - if (type != VAR_SUBST && strchr(uvalue, '$') != NULL) { - /* Check for syntax errors such as unclosed expressions or - * unknown modifiers. */ - char *expandedValue; + if (opts.strict) { + if (type != VAR_SUBST && strchr(uvalue, '$') != NULL) { + char *expandedValue; - (void)Var_Subst(uvalue, ctxt, VARE_NONE, &expandedValue); - /* TODO: handle errors */ - free(expandedValue); + (void)Var_Subst(uvalue, ctxt, VARE_NONE, + &expandedValue); + /* TODO: handle errors */ + free(expandedValue); + } } - } } static void VarAssign_EvalSubst(const char *name, const char *uvalue, GNode *ctxt, - const char **out_avalue, void **out_avalue_freeIt) -{ - const char *avalue = uvalue; - char *evalue; - Boolean savedPreserveUndefined = preserveUndefined; - - /* TODO: Can this assignment to preserveUndefined be moved further down - * to the actually interesting Var_Subst call, without affecting any - * edge cases? - * - * It might affect the implicit expansion of the variable name in the - * Var_Exists and Var_Set calls, even though it's unlikely that anyone - * cared about this edge case when adding this code. In addition, - * variable assignments should not refer to any undefined variables in - * the variable name. */ - preserveUndefined = TRUE; - - /* - * make sure that we set the variable the first time to nothing - * so that it gets substituted! - */ - if (!Var_Exists(name, ctxt)) - Var_Set(name, "", ctxt); - - (void)Var_Subst(uvalue, ctxt, VARE_WANTRES|VARE_KEEP_DOLLAR, &evalue); - /* TODO: handle errors */ - preserveUndefined = savedPreserveUndefined; - avalue = evalue; - Var_Set(name, avalue, ctxt); - - *out_avalue = avalue; - *out_avalue_freeIt = evalue; + FStr *out_avalue) +{ + const char *avalue; + char *evalue; + + /* + * make sure that we set the variable the first time to nothing + * so that it gets substituted! + */ + if (!Var_Exists(name, ctxt)) + Var_Set(name, "", ctxt); + + (void)Var_Subst(uvalue, ctxt, + VARE_WANTRES | VARE_KEEP_DOLLAR | VARE_KEEP_UNDEF, &evalue); + /* TODO: handle errors */ + + avalue = evalue; + Var_Set(name, avalue, ctxt); + + *out_avalue = (FStr){ avalue, evalue }; } static void VarAssign_EvalShell(const char *name, const char *uvalue, GNode *ctxt, - const char **out_avalue, void **out_avalue_freeIt) -{ - const char *cmd, *errfmt; - char *cmdOut; - void *cmd_freeIt = NULL; - - cmd = uvalue; - if (strchr(cmd, '$') != NULL) { - char *ecmd; - (void)Var_Subst(cmd, VAR_CMDLINE, VARE_WANTRES | VARE_UNDEFERR, &ecmd); - /* TODO: handle errors */ - cmd = cmd_freeIt = ecmd; - } + FStr *out_avalue) +{ + FStr cmd; + const char *errfmt; + char *cmdOut; + + cmd = FStr_InitRefer(uvalue); + if (strchr(cmd.str, '$') != NULL) { + char *expanded; + (void)Var_Subst(cmd.str, VAR_CMDLINE, + VARE_WANTRES | VARE_UNDEFERR, &expanded); + /* TODO: handle errors */ + cmd = FStr_InitOwn(expanded); + } - cmdOut = Cmd_Exec(cmd, &errfmt); - Var_Set(name, cmdOut, ctxt); - *out_avalue = *out_avalue_freeIt = cmdOut; + cmdOut = Cmd_Exec(cmd.str, &errfmt); + Var_Set(name, cmdOut, ctxt); + *out_avalue = FStr_InitOwn(cmdOut); - if (errfmt) - Parse_Error(PARSE_WARNING, errfmt, cmd); + if (errfmt != NULL) + Parse_Error(PARSE_WARNING, errfmt, cmd.str); - free(cmd_freeIt); + FStr_Done(&cmd); } -/* Perform a variable assignment. +/* + * Perform a variable assignment. * * The actual value of the variable is returned in *out_avalue and * *out_avalue_freeIt. Especially for VAR_SUBST and VAR_SHELL this can differ * from the literal value. * * Return whether the assignment was actually done. The assignment is only - * skipped if the operator is '?=' and the variable already exists. */ + * skipped if the operator is '?=' and the variable already exists. + */ static Boolean VarAssign_Eval(const char *name, VarAssignOp op, const char *uvalue, - GNode *ctxt, const char **out_avalue, void **out_avalue_freeIt) -{ - const char *avalue = uvalue; - void *avalue_freeIt = NULL; + GNode *ctxt, FStr *out_TRUE_avalue) +{ + FStr avalue = FStr_InitRefer(uvalue); + + if (op == VAR_APPEND) + Var_Append(name, uvalue, ctxt); + else if (op == VAR_SUBST) + VarAssign_EvalSubst(name, uvalue, ctxt, &avalue); + else if (op == VAR_SHELL) + VarAssign_EvalShell(name, uvalue, ctxt, &avalue); + else { + if (op == VAR_DEFAULT && Var_Exists(name, ctxt)) + return FALSE; - if (op == VAR_APPEND) - Var_Append(name, uvalue, ctxt); - else if (op == VAR_SUBST) - VarAssign_EvalSubst(name, uvalue, ctxt, &avalue, &avalue_freeIt); - else if (op == VAR_SHELL) - VarAssign_EvalShell(name, uvalue, ctxt, &avalue, &avalue_freeIt); - else { - if (op == VAR_DEFAULT && Var_Exists(name, ctxt)) { - *out_avalue_freeIt = NULL; - return FALSE; + /* Normal assignment -- just do it. */ + Var_Set(name, uvalue, ctxt); } - /* Normal assignment -- just do it. */ - Var_Set(name, uvalue, ctxt); - } - - *out_avalue = avalue; - *out_avalue_freeIt = avalue_freeIt; - return TRUE; + *out_TRUE_avalue = avalue; + return TRUE; } static void VarAssignSpecial(const char *name, const char *avalue) { - if (strcmp(name, MAKEOVERRIDES) == 0) - Main_ExportMAKEFLAGS(FALSE); /* re-export MAKEFLAGS */ - else if (strcmp(name, ".CURDIR") == 0) { - /* - * Someone is being (too?) clever... - * Let's pretend they know what they are doing and - * re-initialize the 'cur' CachedDir. - */ - Dir_InitCur(avalue); - Dir_SetPATH(); - } else if (strcmp(name, MAKE_JOB_PREFIX) == 0) - Job_SetPrefix(); - else if (strcmp(name, MAKE_EXPORTED) == 0) - Var_Export(avalue, FALSE); + if (strcmp(name, MAKEOVERRIDES) == 0) + Main_ExportMAKEFLAGS(FALSE); /* re-export MAKEFLAGS */ + else if (strcmp(name, ".CURDIR") == 0) { + /* + * Someone is being (too?) clever... + * Let's pretend they know what they are doing and + * re-initialize the 'cur' CachedDir. + */ + Dir_InitCur(avalue); + Dir_SetPATH(); + } else if (strcmp(name, MAKE_JOB_PREFIX) == 0) + Job_SetPrefix(); + else if (strcmp(name, MAKE_EXPORTED) == 0) + Var_ExportVars(avalue); } /* Perform the variable variable assignment in the given context. */ void Parse_DoVar(VarAssign *var, GNode *ctxt) { - const char *avalue; /* actual value (maybe expanded) */ - void *avalue_freeIt; + FStr avalue; /* actual value (maybe expanded) */ - VarCheckSyntax(var->op, var->value, ctxt); - if (VarAssign_Eval(var->varname, var->op, var->value, ctxt, - &avalue, &avalue_freeIt)) - VarAssignSpecial(var->varname, avalue); + VarCheckSyntax(var->op, var->value, ctxt); + if (VarAssign_Eval(var->varname, var->op, var->value, ctxt, &avalue)) { + VarAssignSpecial(var->varname, avalue.str); + FStr_Done(&avalue); + } - free(avalue_freeIt); - free(var->varname); + free(var->varname); } -/* See if the command possibly calls a sub-make by using the variable - * expressions ${.MAKE}, ${MAKE} or the plain word "make". */ +/* + * See if the command possibly calls a sub-make by using the variable + * expressions ${.MAKE}, ${MAKE} or the plain word "make". + */ static Boolean MaybeSubMake(const char *cmd) { - const char *start; + const char *start; - for (start = cmd; *start != '\0'; start++) { - const char *p = start; - char endc; + for (start = cmd; *start != '\0'; start++) { + const char *p = start; + char endc; - /* XXX: What if progname != "make"? */ - if (p[0] == 'm' && p[1] == 'a' && p[2] == 'k' && p[3] == 'e') - if (start == cmd || !ch_isalnum(p[-1])) - if (!ch_isalnum(p[4])) - return TRUE; + /* XXX: What if progname != "make"? */ + if (p[0] == 'm' && p[1] == 'a' && p[2] == 'k' && p[3] == 'e') + if (start == cmd || !ch_isalnum(p[-1])) + if (!ch_isalnum(p[4])) + return TRUE; - if (*p != '$') - continue; - p++; + if (*p != '$') + continue; + p++; - if (*p == '{') - endc = '}'; - else if (*p == '(') - endc = ')'; - else - continue; - p++; + if (*p == '{') + endc = '}'; + else if (*p == '(') + endc = ')'; + else + continue; + p++; - if (*p == '.') /* Accept either ${.MAKE} or ${MAKE}. */ - p++; + if (*p == '.') /* Accept either ${.MAKE} or ${MAKE}. */ + p++; - if (p[0] == 'M' && p[1] == 'A' && p[2] == 'K' && p[3] == 'E') - if (p[4] == endc) - return TRUE; - } - return FALSE; + if (p[0] == 'M' && p[1] == 'A' && p[2] == 'K' && p[3] == 'E') + if (p[4] == endc) + return TRUE; + } + return FALSE; } -/* Append the command to the target node. +/* + * Append the command to the target node. * * The node may be marked as a submake node if the command is determined to - * be that. */ + * be that. + */ static void ParseAddCmd(GNode *gn, char *cmd) { - /* Add to last (ie current) cohort for :: targets */ - if ((gn->type & OP_DOUBLEDEP) && gn->cohorts->last != NULL) - gn = gn->cohorts->last->datum; - - /* if target already supplied, ignore commands */ - if (!(gn->type & OP_HAS_COMMANDS)) { - Lst_Append(gn->commands, cmd); - if (MaybeSubMake(cmd)) - gn->type |= OP_SUBMAKE; - ParseMark(gn); - } else { + /* Add to last (ie current) cohort for :: targets */ + if ((gn->type & OP_DOUBLEDEP) && gn->cohorts.last != NULL) + gn = gn->cohorts.last->datum; + + /* if target already supplied, ignore commands */ + if (!(gn->type & OP_HAS_COMMANDS)) { + Lst_Append(&gn->commands, cmd); + if (MaybeSubMake(cmd)) + gn->type |= OP_SUBMAKE; + ParseMark(gn); + } else { #if 0 - /* XXX: We cannot do this until we fix the tree */ - Lst_Append(gn->commands, cmd); - Parse_Error(PARSE_WARNING, - "overriding commands for target \"%s\"; " - "previous commands defined at %s: %d ignored", - gn->name, gn->fname, gn->lineno); + /* XXX: We cannot do this until we fix the tree */ + Lst_Append(&gn->commands, cmd); + Parse_Error(PARSE_WARNING, + "overriding commands for target \"%s\"; " + "previous commands defined at %s: %d ignored", + gn->name, gn->fname, gn->lineno); #else - Parse_Error(PARSE_WARNING, + Parse_Error(PARSE_WARNING, "duplicate script for target \"%s\" ignored", gn->name); - ParseErrorInternal(gn->fname, (size_t)gn->lineno, PARSE_WARNING, - "using previous script for \"%s\" defined here", - gn->name); + ParseErrorInternal(gn->fname, (size_t)gn->lineno, PARSE_WARNING, + "using previous script for \"%s\" defined here", + gn->name); #endif - } + } } -/* Add a directory to the path searched for included makefiles bracketed - * by double-quotes. */ +/* + * Add a directory to the path searched for included makefiles bracketed + * by double-quotes. + */ void Parse_AddIncludeDir(const char *dir) { - (void)Dir_AddDir(parseIncPath, dir); + (void)Dir_AddDir(parseIncPath, dir); } -/* Handle one of the .[-ds]include directives by remembering the current file +/* + * Handle one of the .[-ds]include directives by remembering the current file * and pushing the included file on the stack. After the included file has * finished, parsing continues with the including file; see Parse_SetInput * and ParseEOF. * * System includes are looked up in sysIncPath, any other includes are looked * up in the parsedir and then in the directories specified by the -I command * line options. */ static void Parse_include_file(char *file, Boolean isSystem, Boolean depinc, Boolean silent) { - struct loadedfile *lf; - char *fullname; /* full pathname of file */ - char *newName; - char *slash, *incdir; - int fd; - int i; + struct loadedfile *lf; + char *fullname; /* full pathname of file */ + char *newName; + char *slash, *incdir; + int fd; + int i; - fullname = file[0] == '/' ? bmake_strdup(file) : NULL; + fullname = file[0] == '/' ? bmake_strdup(file) : NULL; - if (fullname == NULL && !isSystem) { - /* - * Include files contained in double-quotes are first searched - * relative to the including file's location. We don't want to - * cd there, of course, so we just tack on the old file's - * leading path components and call Dir_FindFile to see if - * we can locate the file. - */ + if (fullname == NULL && !isSystem) { + /* + * Include files contained in double-quotes are first searched + * relative to the including file's location. We don't want to + * cd there, of course, so we just tack on the old file's + * leading path components and call Dir_FindFile to see if + * we can locate the file. + */ + + incdir = bmake_strdup(CurFile()->fname); + slash = strrchr(incdir, '/'); + if (slash != NULL) { + *slash = '\0'; + /* + * Now do lexical processing of leading "../" on the + * filename. + */ + for (i = 0; strncmp(file + i, "../", 3) == 0; i += 3) { + slash = strrchr(incdir + 1, '/'); + if (slash == NULL || strcmp(slash, "/..") == 0) + break; + *slash = '\0'; + } + newName = str_concat3(incdir, "/", file + i); + fullname = Dir_FindFile(newName, parseIncPath); + if (fullname == NULL) + fullname = Dir_FindFile(newName, + &dirSearchPath); + free(newName); + } + free(incdir); + + if (fullname == NULL) { + /* + * Makefile wasn't found in same directory as included + * makefile. + * + * Search for it first on the -I search path, then on + * the .PATH search path, if not found in a -I + * directory. If we have a suffix-specific path, we + * should use that. + */ + const char *suff; + SearchPath *suffPath = NULL; + + if ((suff = strrchr(file, '.')) != NULL) { + suffPath = Suff_GetPath(suff); + if (suffPath != NULL) + fullname = Dir_FindFile(file, suffPath); + } + if (fullname == NULL) { + fullname = Dir_FindFile(file, parseIncPath); + if (fullname == NULL) + fullname = Dir_FindFile(file, + &dirSearchPath); + } + } + } - incdir = bmake_strdup(CurFile()->fname); - slash = strrchr(incdir, '/'); - if (slash != NULL) { - *slash = '\0'; - /* Now do lexical processing of leading "../" on the filename */ - for (i = 0; strncmp(file + i, "../", 3) == 0; i += 3) { - slash = strrchr(incdir + 1, '/'); - if (slash == NULL || strcmp(slash, "/..") == 0) - break; - *slash = '\0'; - } - newName = str_concat3(incdir, "/", file + i); - fullname = Dir_FindFile(newName, parseIncPath); - if (fullname == NULL) - fullname = Dir_FindFile(newName, dirSearchPath); - free(newName); - } - free(incdir); + /* Looking for a system file or file still not found */ + if (fullname == NULL) { + /* + * Look for it on the system path + */ + SearchPath *path = Lst_IsEmpty(sysIncPath) ? defSysIncPath + : sysIncPath; + fullname = Dir_FindFile(file, path); + } if (fullname == NULL) { - /* - * Makefile wasn't found in same directory as included makefile. - * Search for it first on the -I search path, - * then on the .PATH search path, if not found in a -I directory. - * If we have a suffix specific path we should use that. - */ - const char *suff; - SearchPath *suffPath = NULL; - - if ((suff = strrchr(file, '.'))) { - suffPath = Suff_GetPath(suff); - if (suffPath != NULL) - fullname = Dir_FindFile(file, suffPath); - } - if (fullname == NULL) { - fullname = Dir_FindFile(file, parseIncPath); - if (fullname == NULL) - fullname = Dir_FindFile(file, dirSearchPath); - } - } - } - - /* Looking for a system file or file still not found */ - if (fullname == NULL) { - /* - * Look for it on the system path - */ - SearchPath *path = Lst_IsEmpty(sysIncPath) ? defSysIncPath : sysIncPath; - fullname = Dir_FindFile(file, path); - } - - if (fullname == NULL) { - if (!silent) - Parse_Error(PARSE_FATAL, "Could not find %s", file); - return; - } - - /* Actually open the file... */ - fd = open(fullname, O_RDONLY); - if (fd == -1) { - if (!silent) - Parse_Error(PARSE_FATAL, "Cannot open %s", fullname); - free(fullname); - return; - } - - /* load it */ - lf = loadfile(fullname, fd); - - /* Start reading from this file next */ - Parse_SetInput(fullname, 0, -1, loadedfile_nextbuf, lf); - CurFile()->lf = lf; - if (depinc) - doing_depend = depinc; /* only turn it on */ + if (!silent) + Parse_Error(PARSE_FATAL, "Could not find %s", file); + return; + } + + /* Actually open the file... */ + fd = open(fullname, O_RDONLY); + if (fd == -1) { + if (!silent) + Parse_Error(PARSE_FATAL, "Cannot open %s", fullname); + free(fullname); + return; + } + + /* load it */ + lf = loadfile(fullname, fd); + + /* Start reading from this file next */ + Parse_SetInput(fullname, 0, -1, loadedfile_readMore, lf); + CurFile()->lf = lf; + if (depinc) + doing_depend = depinc; /* only turn it on */ } static void -ParseDoInclude(char *line) +ParseDoInclude(char *line /* XXX: bad name */) { - char endc; /* the character which ends the file spec */ - char *cp; /* current position in file spec */ - Boolean silent = *line != 'i'; - char *file = line + (silent ? 8 : 7); + char endc; /* the character which ends the file spec */ + char *cp; /* current position in file spec */ + Boolean silent = line[0] != 'i'; + char *file = line + (silent ? 8 : 7); - /* Skip to delimiter character so we know where to look */ - pp_skip_hspace(&file); + /* Skip to delimiter character so we know where to look */ + pp_skip_hspace(&file); - if (*file != '"' && *file != '<') { - Parse_Error(PARSE_FATAL, + if (*file != '"' && *file != '<') { + Parse_Error(PARSE_FATAL, ".include filename must be delimited by '\"' or '<'"); - return; - } - - /* - * Set the search path on which to find the include file based on the - * characters which bracket its name. Angle-brackets imply it's - * a system Makefile while double-quotes imply it's a user makefile - */ - if (*file == '<') - endc = '>'; - else - endc = '"'; - - /* Skip to matching delimiter */ - for (cp = ++file; *cp && *cp != endc; cp++) - continue; - - if (*cp != endc) { - Parse_Error(PARSE_FATAL, + return; + } + + /* + * Set the search path on which to find the include file based on the + * characters which bracket its name. Angle-brackets imply it's + * a system Makefile while double-quotes imply it's a user makefile + */ + if (*file == '<') + endc = '>'; + else + endc = '"'; + + /* Skip to matching delimiter */ + for (cp = ++file; *cp != '\0' && *cp != endc; cp++) + continue; + + if (*cp != endc) { + Parse_Error(PARSE_FATAL, "Unclosed .include filename. '%c' expected", endc); - return; - } + return; + } - *cp = '\0'; + *cp = '\0'; - /* - * Substitute for any variables in the filename before trying to - * find the file. - */ - (void)Var_Subst(file, VAR_CMDLINE, VARE_WANTRES, &file); - /* TODO: handle errors */ + /* + * Substitute for any variables in the filename before trying to + * find the file. + */ + (void)Var_Subst(file, VAR_CMDLINE, VARE_WANTRES, &file); + /* TODO: handle errors */ - Parse_include_file(file, endc == '>', *line == 'd', silent); - free(file); + Parse_include_file(file, endc == '>', line[0] == 'd', silent); + free(file); } -/* Split filename into dirname + basename, then assign these to the - * given variables. */ +/* + * Split filename into dirname + basename, then assign these to the + * given variables. + */ static void SetFilenameVars(const char *filename, const char *dirvar, const char *filevar) { - const char *slash, *dirname, *basename; - void *freeIt; + const char *slash, *dirname, *basename; + void *freeIt; - slash = strrchr(filename, '/'); - if (slash == NULL) { - dirname = curdir; - basename = filename; - freeIt = NULL; - } else { - dirname = freeIt = bmake_strsedup(filename, slash); - basename = slash + 1; - } + slash = strrchr(filename, '/'); + if (slash == NULL) { + dirname = curdir; + basename = filename; + freeIt = NULL; + } else { + dirname = freeIt = bmake_strsedup(filename, slash); + basename = slash + 1; + } - Var_Set(dirvar, dirname, VAR_GLOBAL); - Var_Set(filevar, basename, VAR_GLOBAL); + Var_Set(dirvar, dirname, VAR_GLOBAL); + Var_Set(filevar, basename, VAR_GLOBAL); - DEBUG5(PARSE, "%s: ${%s} = `%s' ${%s} = `%s'\n", - __func__, dirvar, dirname, filevar, basename); - free(freeIt); + DEBUG5(PARSE, "%s: ${%s} = `%s' ${%s} = `%s'\n", + __func__, dirvar, dirname, filevar, basename); + free(freeIt); } -/* Return the immediately including file. +/* + * Return the immediately including file. * * This is made complicated since the .for loop is implemented as a special - * kind of .include; see For_Run. */ + * kind of .include; see For_Run. + */ static const char * GetActuallyIncludingFile(void) { - size_t i; - const IFile *incs = GetInclude(0); + size_t i; + const IFile *incs = GetInclude(0); - for (i = includes.len; i >= 2; i--) - if (!incs[i - 1].fromForLoop) - return incs[i - 2].fname; - return NULL; + for (i = includes.len; i >= 2; i--) + if (!incs[i - 1].fromForLoop) + return incs[i - 2].fname; + return NULL; } /* Set .PARSEDIR, .PARSEFILE, .INCLUDEDFROMDIR and .INCLUDEDFROMFILE. */ static void ParseSetParseFile(const char *filename) { - const char *including; + const char *including; - SetFilenameVars(filename, ".PARSEDIR", ".PARSEFILE"); + SetFilenameVars(filename, ".PARSEDIR", ".PARSEFILE"); - including = GetActuallyIncludingFile(); - if (including != NULL) { - SetFilenameVars(including, - ".INCLUDEDFROMDIR", ".INCLUDEDFROMFILE"); - } else { - Var_Delete(".INCLUDEDFROMDIR", VAR_GLOBAL); - Var_Delete(".INCLUDEDFROMFILE", VAR_GLOBAL); - } + including = GetActuallyIncludingFile(); + if (including != NULL) { + SetFilenameVars(including, + ".INCLUDEDFROMDIR", ".INCLUDEDFROMFILE"); + } else { + Var_Delete(".INCLUDEDFROMDIR", VAR_GLOBAL); + Var_Delete(".INCLUDEDFROMFILE", VAR_GLOBAL); + } } static Boolean StrContainsWord(const char *str, const char *word) { - size_t strLen = strlen(str); - size_t wordLen = strlen(word); - const char *p, *end; + size_t strLen = strlen(str); + size_t wordLen = strlen(word); + const char *p, *end; - if (strLen < wordLen) - return FALSE; /* str is too short to contain word */ + if (strLen < wordLen) + return FALSE; /* str is too short to contain word */ - end = str + strLen - wordLen; - for (p = str; p != NULL; p = strchr(p, ' ')) { - if (*p == ' ') - p++; - if (p > end) - return FALSE; /* cannot contain word */ + end = str + strLen - wordLen; + for (p = str; p != NULL; p = strchr(p, ' ')) { + if (*p == ' ') + p++; + if (p > end) + return FALSE; /* cannot contain word */ - if (memcmp(p, word, wordLen) == 0 && - (p[wordLen] == '\0' || p[wordLen] == ' ')) - return TRUE; - } - return FALSE; + if (memcmp(p, word, wordLen) == 0 && + (p[wordLen] == '\0' || p[wordLen] == ' ')) + return TRUE; + } + return FALSE; } -/* XXX: Searching through a set of words with this linear search is - * inefficient for variables that contain thousands of words. */ -/* XXX: The paths in this list don't seem to be normalized in any way. */ +/* + * XXX: Searching through a set of words with this linear search is + * inefficient for variables that contain thousands of words. + * + * XXX: The paths in this list don't seem to be normalized in any way. + */ static Boolean VarContainsWord(const char *varname, const char *word) { - void *val_freeIt; - const char *val = Var_Value(varname, VAR_GLOBAL, &val_freeIt); - Boolean found = val != NULL && StrContainsWord(val, word); - bmake_free(val_freeIt); - return found; + FStr val = Var_Value(varname, VAR_GLOBAL); + Boolean found = val.str != NULL && StrContainsWord(val.str, word); + FStr_Done(&val); + return found; } -/* Track the makefiles we read - so makefiles can set dependencies on them. +/* + * Track the makefiles we read - so makefiles can set dependencies on them. * Avoid adding anything more than once. * * Time complexity: O(n) per call, in total O(n^2), where n is the number - * of makefiles that have been loaded. */ + * of makefiles that have been loaded. + */ static void ParseTrackInput(const char *name) { - if (!VarContainsWord(MAKE_MAKEFILES, name)) - Var_Append(MAKE_MAKEFILES, name, VAR_GLOBAL); + if (!VarContainsWord(MAKE_MAKEFILES, name)) + Var_Append(MAKE_MAKEFILES, name, VAR_GLOBAL); } -/* Start parsing from the given source. +/* + * Start parsing from the given source. * - * The given file is added to the includes stack. */ + * The given file is added to the includes stack. + */ void -Parse_SetInput(const char *name, int line, int fd, - char *(*nextbuf)(void *, size_t *), void *arg) -{ - IFile *curFile; - char *buf; - size_t len; - Boolean fromForLoop = name == NULL; - - if (fromForLoop) - name = CurFile()->fname; - else - ParseTrackInput(name); - - if (DEBUG(PARSE)) - debug_printf("%s: file %s, line %d, fd %d, nextbuf %s, arg %p\n", - __func__, name, line, fd, - nextbuf == loadedfile_nextbuf ? "loadedfile" : "other", - arg); - - if (fd == -1 && nextbuf == NULL) - /* sanity */ - return; - - curFile = Vector_Push(&includes); - curFile->fname = bmake_strdup(name); - curFile->fromForLoop = fromForLoop; - curFile->lineno = line; - curFile->first_lineno = line; - curFile->nextbuf = nextbuf; - curFile->nextbuf_arg = arg; - curFile->lf = NULL; - curFile->depending = doing_depend; /* restore this on EOF */ - - assert(nextbuf != NULL); - - /* Get first block of input data */ - buf = curFile->nextbuf(curFile->nextbuf_arg, &len); - if (buf == NULL) { - /* Was all a waste of time ... */ - if (curFile->fname) - free(curFile->fname); - free(curFile); - return; - } - curFile->buf_freeIt = buf; - curFile->buf_ptr = buf; - curFile->buf_end = buf + len; - - curFile->cond_depth = Cond_save_depth(); - ParseSetParseFile(name); +Parse_SetInput(const char *name, int lineno, int fd, + ReadMoreProc readMore, void *readMoreArg) +{ + IFile *curFile; + char *buf; + size_t len; + Boolean fromForLoop = name == NULL; + + if (fromForLoop) + name = CurFile()->fname; + else + ParseTrackInput(name); + + DEBUG3(PARSE, "Parse_SetInput: %s %s, line %d\n", + readMore == loadedfile_readMore ? "file" : ".for loop in", + name, lineno); + + if (fd == -1 && readMore == NULL) + /* sanity */ + return; + + curFile = Vector_Push(&includes); + curFile->fname = bmake_strdup(name); + curFile->fromForLoop = fromForLoop; + curFile->lineno = lineno; + curFile->first_lineno = lineno; + curFile->readMore = readMore; + curFile->readMoreArg = readMoreArg; + curFile->lf = NULL; + curFile->depending = doing_depend; /* restore this on EOF */ + + assert(readMore != NULL); + + /* Get first block of input data */ + buf = curFile->readMore(curFile->readMoreArg, &len); + if (buf == NULL) { + /* Was all a waste of time ... */ + if (curFile->fname != NULL) + free(curFile->fname); + free(curFile); + return; + } + curFile->buf_freeIt = buf; + curFile->buf_ptr = buf; + curFile->buf_end = buf + len; + + curFile->cond_depth = Cond_save_depth(); + ParseSetParseFile(name); } /* Check if the directive is an include directive. */ static Boolean IsInclude(const char *dir, Boolean sysv) { if (dir[0] == 's' || dir[0] == '-' || (dir[0] == 'd' && !sysv)) dir++; if (strncmp(dir, "include", 7) != 0) return FALSE; /* Space is not mandatory for BSD .include */ return !sysv || ch_isspace(dir[7]); } #ifdef SYSVINCLUDE /* Check if the line is a SYSV include directive. */ static Boolean IsSysVInclude(const char *line) { const char *p; if (!IsInclude(line, TRUE)) return FALSE; /* Avoid interpreting a dependency line as an include */ for (p = line; (p = strchr(p, ':')) != NULL;) { /* end of line -> it's a dependency */ if (*++p == '\0') return FALSE; /* '::' operator or ': ' -> it's a dependency */ if (*p == ':' || ch_isspace(*p)) return FALSE; } return TRUE; } /* Push to another file. The line points to the word "include". */ static void ParseTraditionalInclude(char *line) { - char *cp; /* current position in file spec */ - Boolean done = FALSE; - Boolean silent = line[0] != 'i'; - char *file = line + (silent ? 8 : 7); - char *all_files; + char *cp; /* current position in file spec */ + Boolean done = FALSE; + Boolean silent = line[0] != 'i'; + char *file = line + (silent ? 8 : 7); + char *all_files; - DEBUG2(PARSE, "%s: %s\n", __func__, file); + DEBUG2(PARSE, "%s: %s\n", __func__, file); - pp_skip_whitespace(&file); + pp_skip_whitespace(&file); - /* - * Substitute for any variables in the file name before trying to - * find the thing. - */ - (void)Var_Subst(file, VAR_CMDLINE, VARE_WANTRES, &all_files); - /* TODO: handle errors */ + /* + * Substitute for any variables in the file name before trying to + * find the thing. + */ + (void)Var_Subst(file, VAR_CMDLINE, VARE_WANTRES, &all_files); + /* TODO: handle errors */ - if (*file == '\0') { - Parse_Error(PARSE_FATAL, "Filename missing from \"include\""); - goto out; - } + if (*file == '\0') { + Parse_Error(PARSE_FATAL, "Filename missing from \"include\""); + goto out; + } - for (file = all_files; !done; file = cp + 1) { - /* Skip to end of line or next whitespace */ - for (cp = file; *cp && !ch_isspace(*cp); cp++) - continue; + for (file = all_files; !done; file = cp + 1) { + /* Skip to end of line or next whitespace */ + for (cp = file; *cp != '\0' && !ch_isspace(*cp); cp++) + continue; - if (*cp != '\0') - *cp = '\0'; - else - done = TRUE; + if (*cp != '\0') + *cp = '\0'; + else + done = TRUE; - Parse_include_file(file, FALSE, FALSE, silent); - } + Parse_include_file(file, FALSE, FALSE, silent); + } out: - free(all_files); + free(all_files); } #endif #ifdef GMAKEEXPORT /* Parse "export =", and actually export it. */ static void ParseGmakeExport(char *line) { - char *variable = line + 6; - char *value; + char *variable = line + 6; + char *value; - DEBUG2(PARSE, "%s: %s\n", __func__, variable); + DEBUG2(PARSE, "%s: %s\n", __func__, variable); - pp_skip_whitespace(&variable); + pp_skip_whitespace(&variable); - for (value = variable; *value && *value != '='; value++) - continue; + for (value = variable; *value != '\0' && *value != '='; value++) + continue; - if (*value != '=') { - Parse_Error(PARSE_FATAL, + if (*value != '=') { + Parse_Error(PARSE_FATAL, "Variable/Value missing from \"export\""); - return; - } - *value++ = '\0'; /* terminate variable */ + return; + } + *value++ = '\0'; /* terminate variable */ - /* - * Expand the value before putting it in the environment. - */ - (void)Var_Subst(value, VAR_CMDLINE, VARE_WANTRES, &value); - /* TODO: handle errors */ + /* + * Expand the value before putting it in the environment. + */ + (void)Var_Subst(value, VAR_CMDLINE, VARE_WANTRES, &value); + /* TODO: handle errors */ - setenv(variable, value, 1); - free(value); + setenv(variable, value, 1); + free(value); } #endif -/* Called when EOF is reached in the current file. If we were reading an +/* + * Called when EOF is reached in the current file. If we were reading an * include file or a .for loop, the includes stack is popped and things set * up to go back to reading the previous file at the previous location. * * Results: * TRUE to continue parsing, i.e. it had only reached the end of an * included file, FALSE if the main file has been parsed completely. */ static Boolean ParseEOF(void) { - char *ptr; - size_t len; - IFile *curFile = CurFile(); + char *ptr; + size_t len; + IFile *curFile = CurFile(); - assert(curFile->nextbuf != NULL); + assert(curFile->readMore != NULL); - doing_depend = curFile->depending; /* restore this */ - /* get next input buffer, if any */ - ptr = curFile->nextbuf(curFile->nextbuf_arg, &len); - curFile->buf_ptr = ptr; - curFile->buf_freeIt = ptr; - curFile->buf_end = ptr + len; /* XXX: undefined behavior if ptr == NULL */ - curFile->lineno = curFile->first_lineno; - if (ptr != NULL) - return TRUE; /* Iterate again */ + doing_depend = curFile->depending; /* restore this */ + /* get next input buffer, if any */ + ptr = curFile->readMore(curFile->readMoreArg, &len); + curFile->buf_ptr = ptr; + curFile->buf_freeIt = ptr; + curFile->buf_end = ptr == NULL ? NULL : ptr + len; + curFile->lineno = curFile->first_lineno; + if (ptr != NULL) + return TRUE; /* Iterate again */ - /* Ensure the makefile (or loop) didn't have mismatched conditionals */ - Cond_restore_depth(curFile->cond_depth); + /* Ensure the makefile (or loop) didn't have mismatched conditionals */ + Cond_restore_depth(curFile->cond_depth); - if (curFile->lf != NULL) { - loadedfile_destroy(curFile->lf); - curFile->lf = NULL; - } - - /* Dispose of curFile info */ - /* Leak curFile->fname because all the gnodes have pointers to it */ - free(curFile->buf_freeIt); - Vector_Pop(&includes); - - if (includes.len == 0) { - /* We've run out of input */ - Var_Delete(".PARSEDIR", VAR_GLOBAL); - Var_Delete(".PARSEFILE", VAR_GLOBAL); - Var_Delete(".INCLUDEDFROMDIR", VAR_GLOBAL); - Var_Delete(".INCLUDEDFROMFILE", VAR_GLOBAL); - return FALSE; - } + if (curFile->lf != NULL) { + loadedfile_destroy(curFile->lf); + curFile->lf = NULL; + } - curFile = CurFile(); - DEBUG2(PARSE, "ParseEOF: returning to file %s, line %d\n", - curFile->fname, curFile->lineno); + /* Dispose of curFile info */ + /* Leak curFile->fname because all the gnodes have pointers to it. */ + free(curFile->buf_freeIt); + Vector_Pop(&includes); - ParseSetParseFile(curFile->fname); - return TRUE; + if (includes.len == 0) { + /* We've run out of input */ + Var_Delete(".PARSEDIR", VAR_GLOBAL); + Var_Delete(".PARSEFILE", VAR_GLOBAL); + Var_Delete(".INCLUDEDFROMDIR", VAR_GLOBAL); + Var_Delete(".INCLUDEDFROMFILE", VAR_GLOBAL); + return FALSE; + } + + curFile = CurFile(); + DEBUG2(PARSE, "ParseEOF: returning to file %s, line %d\n", + curFile->fname, curFile->lineno); + + ParseSetParseFile(curFile->fname); + return TRUE; } -typedef enum GetLineMode { - PARSE_NORMAL, - PARSE_RAW, - PARSE_SKIP -} GetLineMode; +typedef enum ParseRawLineResult { + PRLR_LINE, + PRLR_EOF, + PRLR_ERROR +} ParseRawLineResult; -static char * -ParseGetLine(GetLineMode mode) +/* + * Parse until the end of a line, taking into account lines that end with + * backslash-newline. + */ +static ParseRawLineResult +ParseRawLine(IFile *curFile, char **out_line, char **out_line_end, + char **out_firstBackslash, char **out_firstComment) { - IFile *cf = CurFile(); - char *ptr; - char ch; - char *line; - char *line_end; - char *escaped; - char *comment; - char *tp; - - /* Loop through blank lines and comment lines */ - for (;;) { - cf->lineno++; - line = cf->buf_ptr; - ptr = line; - line_end = line; - escaped = NULL; - comment = NULL; + char *line = curFile->buf_ptr; + char *p = line; + char *line_end = line; + char *firstBackslash = NULL; + char *firstComment = NULL; + ParseRawLineResult res = PRLR_LINE; + + curFile->lineno++; + for (;;) { - /* XXX: can buf_end ever be null? */ - if (cf->buf_end != NULL && ptr == cf->buf_end) { - /* end of buffer */ - ch = '\0'; - break; - } - ch = *ptr; - if (ch == '\0' || (ch == '\\' && ptr[1] == '\0')) { - /* XXX: can buf_end ever be null? */ - if (cf->buf_end == NULL) - /* End of string (aka for loop) data */ - break; - /* see if there is more we can parse */ - while (ptr++ < cf->buf_end) { - if ((ch = *ptr) == '\n') { - if (ptr > line && ptr[-1] == '\\') - continue; - Parse_Error(PARSE_WARNING, - "Zero byte read from file, " - "skipping rest of line."); + char ch; + + if (p == curFile->buf_end) { + res = PRLR_EOF; break; - } } - /* XXX: Can cf->nextbuf ever be NULL? */ - if (cf->nextbuf != NULL) { - /* - * End of this buffer; return EOF and outer logic - * will get the next one. (eww) - */ - break; + + ch = *p; + if (ch == '\0' || + (ch == '\\' && p + 1 < curFile->buf_end && p[1] == '\0')) { + Parse_Error(PARSE_FATAL, "Zero byte read from file"); + return PRLR_ERROR; } - Parse_Error(PARSE_FATAL, "Zero byte read from file"); - return NULL; - } - - if (ch == '\\') { - /* Don't treat next character as special, remember first one */ - if (escaped == NULL) - escaped = ptr; - if (ptr[1] == '\n') - cf->lineno++; - ptr += 2; - line_end = ptr; - continue; - } - if (ch == '#' && comment == NULL) { - /* Remember first '#' for comment stripping */ - /* Unless previous char was '[', as in modifier :[#] */ - if (!(ptr > line && ptr[-1] == '[')) - comment = line_end; - } - ptr++; - if (ch == '\n') - break; - if (!ch_isspace(ch)) - /* We are not interested in trailing whitespace */ - line_end = ptr; - } - /* Save next 'to be processed' location */ - cf->buf_ptr = ptr; + /* Treat next character after '\' as literal. */ + if (ch == '\\') { + if (firstBackslash == NULL) + firstBackslash = p; + if (p[1] == '\n') { + curFile->lineno++; + if (p + 2 == curFile->buf_end) { + line_end = p; + *line_end = '\n'; + p += 2; + continue; + } + } + p += 2; + line_end = p; + assert(p <= curFile->buf_end); + continue; + } - /* Check we have a non-comment, non-blank line */ - if (line_end == line || comment == line) { - if (ch == '\0') - /* At end of file */ - return NULL; - /* Parse another line */ - continue; - } + /* + * Remember the first '#' for comment stripping, unless + * the previous char was '[', as in the modifier ':[#]'. + */ + if (ch == '#' && firstComment == NULL && + !(p > line && p[-1] == '[')) + firstComment = line_end; - /* We now have a line of data */ - *line_end = '\0'; + p++; + if (ch == '\n') + break; - if (mode == PARSE_RAW) { - /* Leave '\' (etc) in line buffer (eg 'for' lines) */ - return line; + /* We are not interested in trailing whitespace. */ + if (!ch_isspace(ch)) + line_end = p; } - if (mode == PARSE_SKIP) { - /* Completely ignore non-directives */ - if (line[0] != '.') - continue; - /* We could do more of the .else/.elif/.endif checks here */ + *out_line = line; + curFile->buf_ptr = p; + *out_line_end = line_end; + *out_firstBackslash = firstBackslash; + *out_firstComment = firstComment; + return res; +} + +/* + * Beginning at start, unescape '\#' to '#' and replace backslash-newline + * with a single space. + */ +static void +UnescapeBackslash(char *line, char *start) +{ + char *src = start; + char *dst = start; + char *spaceStart = line; + + for (;;) { + char ch = *src++; + if (ch != '\\') { + if (ch == '\0') + break; + *dst++ = ch; + continue; + } + + ch = *src++; + if (ch == '\0') { + /* Delete '\\' at end of buffer */ + dst--; + break; + } + + /* Delete '\\' from before '#' on non-command lines */ + if (ch == '#' && line[0] != '\t') { + *dst++ = ch; + continue; + } + + if (ch != '\n') { + /* Leave '\\' in buffer for later */ + *dst++ = '\\'; + /* + * Make sure we don't delete an escaped ' ' from the + * line end. + */ + spaceStart = dst + 1; + *dst++ = ch; + continue; + } + + /* + * Escaped '\n' -- replace following whitespace with a single + * ' '. + */ + pp_skip_hspace(&src); + *dst++ = ' '; } - break; - } - /* Brutally ignore anything after a non-escaped '#' in non-commands */ - if (comment != NULL && line[0] != '\t') { - line_end = comment; - *line_end = '\0'; - } + /* Delete any trailing spaces - eg from empty continuations */ + while (dst > spaceStart && ch_isspace(dst[-1])) + dst--; + *dst = '\0'; +} - /* If we didn't see a '\\' then the in-situ data is fine */ - if (escaped == NULL) - return line; +typedef enum GetLineMode { + /* + * Return the next line that is neither empty nor a comment. + * Backslash line continuations are folded into a single space. + * A trailing comment, if any, is discarded. + */ + GLM_NONEMPTY, + + /* + * Return the next line, even if it is empty or a comment. + * Preserve backslash-newline to keep the line numbers correct. + * + * Used in .for loops to collect the body of the loop while waiting + * for the corresponding .endfor. + */ + GLM_FOR_BODY, + + /* + * Return the next line that starts with a dot. + * Backslash line continuations are folded into a single space. + * A trailing comment, if any, is discarded. + * + * Used in .if directives to skip over irrelevant branches while + * waiting for the corresponding .endif. + */ + GLM_DOT +} GetLineMode; + +/* Return the next "interesting" logical line from the current file. */ +static char * +ParseGetLine(GetLineMode mode) +{ + IFile *curFile = CurFile(); + char *line; + char *line_end; + char *firstBackslash; + char *firstComment; + + /* Loop through blank lines and comment lines */ + for (;;) { + ParseRawLineResult res = ParseRawLine(curFile, + &line, &line_end, &firstBackslash, &firstComment); + if (res == PRLR_ERROR) + return NULL; + + if (line_end == line || firstComment == line) { + if (res == PRLR_EOF) + return NULL; + if (mode != GLM_FOR_BODY) + continue; + } + + /* We now have a line of data */ + assert(ch_isspace(*line_end)); + *line_end = '\0'; + + if (mode == GLM_FOR_BODY) + return line; /* Don't join the physical lines. */ - /* Remove escapes from '\n' and '#' */ - tp = ptr = escaped; - escaped = line; - for (; ; *tp++ = ch) { - ch = *ptr++; - if (ch != '\\') { - if (ch == '\0') + if (mode == GLM_DOT && line[0] != '.') + continue; break; - continue; } - ch = *ptr++; - if (ch == '\0') { - /* Delete '\\' at end of buffer */ - tp--; - break; - } + /* Brutally ignore anything after a non-escaped '#' in non-commands. */ + if (firstComment != NULL && line[0] != '\t') + *firstComment = '\0'; + + /* If we didn't see a '\\' then the in-situ data is fine. */ + if (firstBackslash == NULL) + return line; - if (ch == '#' && line[0] != '\t') - /* Delete '\\' from before '#' on non-command lines */ - continue; + /* Remove escapes from '\n' and '#' */ + UnescapeBackslash(line, firstBackslash); + + return line; +} + +static Boolean +ParseSkippedBranches(void) +{ + char *line; - if (ch != '\n') { - /* Leave '\\' in buffer for later */ - *tp++ = '\\'; - /* Make sure we don't delete an escaped ' ' from the line end */ - escaped = tp + 1; - continue; + while ((line = ParseGetLine(GLM_DOT)) != NULL) { + if (Cond_EvalLine(line) == COND_PARSE) + break; + /* + * TODO: Check for typos in .elif directives + * such as .elsif or .elseif. + * + * This check will probably duplicate some of + * the code in ParseLine. Most of the code + * there cannot apply, only ParseVarassign and + * ParseDependency can, and to prevent code + * duplication, these would need to be called + * with a flag called onlyCheckSyntax. + * + * See directive-elif.mk for details. + */ } - /* Escaped '\n' -- replace following whitespace with a single ' '. */ - pp_skip_hspace(&ptr); - ch = ' '; - } + return line != NULL; +} + +static Boolean +ParseForLoop(const char *line) +{ + int rval; + int firstLineno; + + rval = For_Eval(line); + if (rval == 0) + return FALSE; /* Not a .for line */ + if (rval < 0) + return TRUE; /* Syntax error - error printed, ignore line */ + + firstLineno = CurFile()->lineno; + + /* Accumulate loop lines until matching .endfor */ + do { + line = ParseGetLine(GLM_FOR_BODY); + if (line == NULL) { + Parse_Error(PARSE_FATAL, + "Unexpected end of file in for loop."); + break; + } + } while (For_Accum(line)); - /* Delete any trailing spaces - eg from empty continuations */ - while (tp > escaped && ch_isspace(tp[-1])) - tp--; + For_Run(firstLineno); /* Stash each iteration as a new 'input file' */ - *tp = '\0'; - return line; + return TRUE; /* Read next line from for-loop buffer */ } -/* Read an entire line from the input file. Called only by Parse_File. +/* + * Read an entire line from the input file. + * + * Empty lines, .if and .for are completely handled by this function, + * leaving only variable assignments, other directives, dependency lines + * and shell commands to the caller. * * Results: - * A line without its newline and without any trailing whitespace. + * A line without its newline and without any trailing whitespace, + * or NULL. */ static char * ParseReadLine(void) { - char *line; /* Result */ - int lineno; /* Saved line # */ - int rval; + char *line; - for (;;) { - line = ParseGetLine(PARSE_NORMAL); - if (line == NULL) - return NULL; + for (;;) { + line = ParseGetLine(GLM_NONEMPTY); + if (line == NULL) + return NULL; - if (line[0] != '.') - return line; + if (line[0] != '.') + return line; - /* - * The line might be a conditional. Ask the conditional module - * about it and act accordingly - */ - switch (Cond_EvalLine(line)) { - case COND_SKIP: - /* Skip to next conditional that evaluates to COND_PARSE. */ - do { - line = ParseGetLine(PARSE_SKIP); - } while (line && Cond_EvalLine(line) != COND_PARSE); - if (line == NULL) - break; - continue; - case COND_PARSE: - continue; - case COND_INVALID: /* Not a conditional line */ - /* Check for .for loops */ - rval = For_Eval(line); - if (rval == 0) - /* Not a .for line */ - break; - if (rval < 0) - /* Syntax error - error printed, ignore line */ - continue; - /* Start of a .for loop */ - lineno = CurFile()->lineno; - /* Accumulate loop lines until matching .endfor */ - do { - line = ParseGetLine(PARSE_RAW); - if (line == NULL) { - Parse_Error(PARSE_FATAL, - "Unexpected end of file in for loop."); - break; + /* + * The line might be a conditional. Ask the conditional module + * about it and act accordingly + */ + switch (Cond_EvalLine(line)) { + case COND_SKIP: + if (!ParseSkippedBranches()) + return NULL; + continue; + case COND_PARSE: + continue; + case COND_INVALID: /* Not a conditional line */ + if (ParseForLoop(line)) + continue; + break; } - } while (For_Accum(line)); - /* Stash each iteration as a new 'input file' */ - For_Run(lineno); - /* Read next line from for-loop buffer */ - continue; + return line; } - return line; - } } static void FinishDependencyGroup(void) { - GNodeListNode *ln; + GNodeListNode *ln; - if (targets == NULL) - return; + if (targets == NULL) + return; - for (ln = targets->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; + for (ln = targets->first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; - Suff_EndTransform(gn); + Suff_EndTransform(gn); - /* Mark the target as already having commands if it does, to - * keep from having shell commands on multiple dependency lines. */ - if (!Lst_IsEmpty(gn->commands)) - gn->type |= OP_HAS_COMMANDS; - } + /* + * Mark the target as already having commands if it does, to + * keep from having shell commands on multiple dependency + * lines. + */ + if (!Lst_IsEmpty(&gn->commands)) + gn->type |= OP_HAS_COMMANDS; + } - Lst_Free(targets); - targets = NULL; + Lst_Free(targets); + targets = NULL; } /* Add the command to each target from the current dependency spec. */ static void ParseLine_ShellCommand(const char *p) { - cpp_skip_whitespace(&p); - if (*p == '\0') - return; /* skip empty commands */ + cpp_skip_whitespace(&p); + if (*p == '\0') + return; /* skip empty commands */ - if (targets == NULL) { - Parse_Error(PARSE_FATAL, "Unassociated shell command \"%s\"", p); - return; - } + if (targets == NULL) { + Parse_Error(PARSE_FATAL, + "Unassociated shell command \"%s\"", p); + return; + } - { - char *cmd = bmake_strdup(p); - GNodeListNode *ln; + { + char *cmd = bmake_strdup(p); + GNodeListNode *ln; - for (ln = targets->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; - ParseAddCmd(gn, cmd); - } + for (ln = targets->first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; + ParseAddCmd(gn, cmd); + } #ifdef CLEANUP - Lst_Append(targCmds, cmd); + Lst_Append(&targCmds, cmd); #endif - } + } +} + +MAKE_INLINE Boolean +IsDirective(const char *dir, size_t dirlen, const char *name) +{ + return dirlen == strlen(name) && memcmp(dir, name, dirlen) == 0; } +/* + * See if the line starts with one of the known directives, and if so, handle + * the directive. + */ static Boolean ParseDirective(char *line) { - char *cp; + char *cp = line + 1; + const char *dir, *arg; + size_t dirlen; - if (*line == '.') { - /* - * Lines that begin with '.' can be pretty much anything: - * - directives like '.include' or '.if', - * - suffix rules like '.c.o:', - * - dependencies for filenames that start with '.', - * - variable assignments like '.tmp=value'. - */ - cp = line + 1; pp_skip_whitespace(&cp); if (IsInclude(cp, FALSE)) { - ParseDoInclude(cp); - return TRUE; - } - if (strncmp(cp, "undef", 5) == 0) { - const char *varname; - cp += 5; - pp_skip_whitespace(&cp); - varname = cp; - for (; !ch_isspace(*cp) && *cp != '\0'; cp++) - continue; - *cp = '\0'; - Var_Delete(varname, VAR_GLOBAL); - /* TODO: undefine all variables, not only the first */ - /* TODO: use Str_Words, like everywhere else */ - return TRUE; - } else if (strncmp(cp, "export", 6) == 0) { - cp += 6; - pp_skip_whitespace(&cp); - Var_Export(cp, TRUE); - return TRUE; - } else if (strncmp(cp, "unexport", 8) == 0) { - Var_UnExport(cp); - return TRUE; - } else if (strncmp(cp, "info", 4) == 0 || - strncmp(cp, "error", 5) == 0 || - strncmp(cp, "warning", 7) == 0) { - if (ParseMessage(cp)) + ParseDoInclude(cp); + return TRUE; + } + + dir = cp; + while (ch_isalpha(*cp) || *cp == '-') + cp++; + dirlen = (size_t)(cp - dir); + + if (*cp != '\0' && !ch_isspace(*cp)) + return FALSE; + + pp_skip_whitespace(&cp); + arg = cp; + + if (IsDirective(dir, dirlen, "undef")) { + Var_Undef(cp); + return TRUE; + } else if (IsDirective(dir, dirlen, "export")) { + Var_Export(VEM_PLAIN, arg); + return TRUE; + } else if (IsDirective(dir, dirlen, "export-env")) { + Var_Export(VEM_ENV, arg); + return TRUE; + } else if (IsDirective(dir, dirlen, "export-literal")) { + Var_Export(VEM_LITERAL, arg); + return TRUE; + } else if (IsDirective(dir, dirlen, "unexport")) { + Var_UnExport(FALSE, arg); + return TRUE; + } else if (IsDirective(dir, dirlen, "unexport-env")) { + Var_UnExport(TRUE, arg); + return TRUE; + } else if (IsDirective(dir, dirlen, "info")) { + ParseMessage(PARSE_INFO, "info", arg); + return TRUE; + } else if (IsDirective(dir, dirlen, "warning")) { + ParseMessage(PARSE_WARNING, "warning", arg); + return TRUE; + } else if (IsDirective(dir, dirlen, "error")) { + ParseMessage(PARSE_FATAL, "error", arg); return TRUE; } - } - return FALSE; + return FALSE; } static Boolean ParseVarassign(const char *line) { - VarAssign var; + VarAssign var; - if (!Parse_IsVar(line, &var)) - return FALSE; + if (!Parse_IsVar(line, &var)) + return FALSE; - FinishDependencyGroup(); - Parse_DoVar(&var, VAR_GLOBAL); - return TRUE; + FinishDependencyGroup(); + Parse_DoVar(&var, VAR_GLOBAL); + return TRUE; } static char * FindSemicolon(char *p) { - int level = 0; + int level = 0; - for (; *p != '\0'; p++) { - if (*p == '\\' && p[1] != '\0') { - p++; - continue; - } + for (; *p != '\0'; p++) { + if (*p == '\\' && p[1] != '\0') { + p++; + continue; + } - if (*p == '$' && (p[1] == '(' || p[1] == '{')) - level++; - else if (level > 0 && (*p == ')' || *p == '}')) - level--; - else if (level == 0 && *p == ';') - break; - } - return p; + if (*p == '$' && (p[1] == '(' || p[1] == '{')) + level++; + else if (level > 0 && (*p == ')' || *p == '}')) + level--; + else if (level == 0 && *p == ';') + break; + } + return p; } -/* dependency -> target... op [source...] - * op -> ':' | '::' | '!' */ +/* + * dependency -> target... op [source...] + * op -> ':' | '::' | '!' + */ static void ParseDependency(char *line) { - VarEvalFlags eflags; - char *expanded_line; - const char *shellcmd = NULL; - - /* - * For some reason - probably to make the parser impossible - - * a ';' can be used to separate commands from dependencies. - * Attempt to avoid ';' inside substitution patterns. - */ - { - char *semicolon = FindSemicolon(line); - if (*semicolon != '\0') { - /* Terminate the dependency list at the ';' */ - *semicolon = '\0'; - shellcmd = semicolon + 1; - } - } - - /* - * We now know it's a dependency line so it needs to have all - * variables expanded before being parsed. - * - * XXX: Ideally the dependency line would first be split into - * its left-hand side, dependency operator and right-hand side, - * and then each side would be expanded on its own. This would - * allow for the left-hand side to allow only defined variables - * and to allow variables on the right-hand side to be undefined - * as well. - * - * Parsing the line first would also prevent that targets - * generated from variable expressions are interpreted as the - * dependency operator, such as in "target${:U\:} middle: source", - * in which the middle is interpreted as a source, not a target. - */ - - /* In lint mode, allow undefined variables to appear in - * dependency lines. - * - * Ideally, only the right-hand side would allow undefined - * variables since it is common to have optional dependencies. - * Having undefined variables on the left-hand side is more - * unusual though. Since both sides are expanded in a single - * pass, there is not much choice what to do here. - * - * In normal mode, it does not matter whether undefined - * variables are allowed or not since as of 2020-09-14, - * Var_Parse does not print any parse errors in such a case. - * It simply returns the special empty string var_Error, - * which cannot be detected in the result of Var_Subst. */ - eflags = opts.lint ? VARE_WANTRES : VARE_WANTRES | VARE_UNDEFERR; - (void)Var_Subst(line, VAR_CMDLINE, eflags, &expanded_line); - /* TODO: handle errors */ - - /* Need a fresh list for the target nodes */ - if (targets != NULL) - Lst_Free(targets); - targets = Lst_New(); + VarEvalFlags eflags; + char *expanded_line; + const char *shellcmd = NULL; - ParseDoDependency(expanded_line); - free(expanded_line); + /* + * For some reason - probably to make the parser impossible - + * a ';' can be used to separate commands from dependencies. + * Attempt to avoid ';' inside substitution patterns. + */ + { + char *semicolon = FindSemicolon(line); + if (*semicolon != '\0') { + /* Terminate the dependency list at the ';' */ + *semicolon = '\0'; + shellcmd = semicolon + 1; + } + } - if (shellcmd != NULL) - ParseLine_ShellCommand(shellcmd); + /* + * We now know it's a dependency line so it needs to have all + * variables expanded before being parsed. + * + * XXX: Ideally the dependency line would first be split into + * its left-hand side, dependency operator and right-hand side, + * and then each side would be expanded on its own. This would + * allow for the left-hand side to allow only defined variables + * and to allow variables on the right-hand side to be undefined + * as well. + * + * Parsing the line first would also prevent that targets + * generated from variable expressions are interpreted as the + * dependency operator, such as in "target${:U\:} middle: source", + * in which the middle is interpreted as a source, not a target. + */ + + /* In lint mode, allow undefined variables to appear in + * dependency lines. + * + * Ideally, only the right-hand side would allow undefined + * variables since it is common to have optional dependencies. + * Having undefined variables on the left-hand side is more + * unusual though. Since both sides are expanded in a single + * pass, there is not much choice what to do here. + * + * In normal mode, it does not matter whether undefined + * variables are allowed or not since as of 2020-09-14, + * Var_Parse does not print any parse errors in such a case. + * It simply returns the special empty string var_Error, + * which cannot be detected in the result of Var_Subst. */ + eflags = opts.strict ? VARE_WANTRES : VARE_WANTRES | VARE_UNDEFERR; + (void)Var_Subst(line, VAR_CMDLINE, eflags, &expanded_line); + /* TODO: handle errors */ + + /* Need a fresh list for the target nodes */ + if (targets != NULL) + Lst_Free(targets); + targets = Lst_New(); + + ParseDoDependency(expanded_line); + free(expanded_line); + + if (shellcmd != NULL) + ParseLine_ShellCommand(shellcmd); } static void ParseLine(char *line) { - if (ParseDirective(line)) - return; + /* + * Lines that begin with '.' can be pretty much anything: + * - directives like '.include' or '.if', + * - suffix rules like '.c.o:', + * - dependencies for filenames that start with '.', + * - variable assignments like '.tmp=value'. + */ + if (line[0] == '.' && ParseDirective(line)) + return; - if (*line == '\t') { - ParseLine_ShellCommand(line + 1); - return; - } + if (line[0] == '\t') { + ParseLine_ShellCommand(line + 1); + return; + } #ifdef SYSVINCLUDE - if (IsSysVInclude(line)) { - /* - * It's an S3/S5-style "include". - */ - ParseTraditionalInclude(line); - return; - } + if (IsSysVInclude(line)) { + /* + * It's an S3/S5-style "include". + */ + ParseTraditionalInclude(line); + return; + } #endif #ifdef GMAKEEXPORT - if (strncmp(line, "export", 6) == 0 && ch_isspace(line[6]) && - strchr(line, ':') == NULL) { - /* - * It's a Gmake "export". - */ - ParseGmakeExport(line); - return; - } + if (strncmp(line, "export", 6) == 0 && ch_isspace(line[6]) && + strchr(line, ':') == NULL) { + /* + * It's a Gmake "export". + */ + ParseGmakeExport(line); + return; + } #endif - if (ParseVarassign(line)) - return; + if (ParseVarassign(line)) + return; - FinishDependencyGroup(); + FinishDependencyGroup(); - ParseDependency(line); + ParseDependency(line); } -/* Parse a top-level makefile, incorporating its content into the global +/* + * Parse a top-level makefile, incorporating its content into the global * dependency graph. * * Input: * name The name of the file being read * fd The open file to parse; will be closed at the end */ void Parse_File(const char *name, int fd) { - char *line; /* the line we're working on */ - struct loadedfile *lf; + char *line; /* the line we're working on */ + struct loadedfile *lf; - lf = loadfile(name, fd); + lf = loadfile(name, fd); - assert(targets == NULL); + assert(targets == NULL); - if (name == NULL) - name = "(stdin)"; + if (name == NULL) + name = "(stdin)"; - Parse_SetInput(name, 0, -1, loadedfile_nextbuf, lf); - CurFile()->lf = lf; + Parse_SetInput(name, 0, -1, loadedfile_readMore, lf); + CurFile()->lf = lf; - do { - while ((line = ParseReadLine()) != NULL) { - DEBUG2(PARSE, "ParseReadLine (%d): '%s'\n", - CurFile()->lineno, line); - ParseLine(line); + do { + while ((line = ParseReadLine()) != NULL) { + DEBUG2(PARSE, "ParseReadLine (%d): '%s'\n", + CurFile()->lineno, line); + ParseLine(line); + } + /* Reached EOF, but it may be just EOF of an include file. */ + } while (ParseEOF()); + + FinishDependencyGroup(); + + if (fatals != 0) { + (void)fflush(stdout); + (void)fprintf(stderr, + "%s: Fatal errors encountered -- cannot continue", + progname); + PrintOnError(NULL, NULL); + exit(1); } - /* - * Reached EOF, but it may be just EOF of an include file... - */ - } while (ParseEOF()); - - FinishDependencyGroup(); - - if (fatals != 0) { - (void)fflush(stdout); - (void)fprintf(stderr, - "%s: Fatal errors encountered -- cannot continue", - progname); - PrintOnError(NULL, NULL); - exit(1); - } } /* Initialize the parsing module. */ void Parse_Init(void) { - mainNode = NULL; - parseIncPath = Lst_New(); - sysIncPath = Lst_New(); - defSysIncPath = Lst_New(); - Vector_Init(&includes, sizeof(IFile)); -#ifdef CLEANUP - targCmds = Lst_New(); -#endif + mainNode = NULL; + parseIncPath = SearchPath_New(); + sysIncPath = SearchPath_New(); + defSysIncPath = SearchPath_New(); + Vector_Init(&includes, sizeof(IFile)); } /* Clean up the parsing module. */ void Parse_End(void) { #ifdef CLEANUP - Lst_Destroy(targCmds, free); - assert(targets == NULL); - Lst_Destroy(defSysIncPath, Dir_Destroy); - Lst_Destroy(sysIncPath, Dir_Destroy); - Lst_Destroy(parseIncPath, Dir_Destroy); - assert(includes.len == 0); - Vector_Done(&includes); + Lst_DoneCall(&targCmds, free); + assert(targets == NULL); + SearchPath_Free(defSysIncPath); + SearchPath_Free(sysIncPath); + SearchPath_Free(parseIncPath); + assert(includes.len == 0); + Vector_Done(&includes); #endif } /* * Return a list containing the single main target to create. * If no such target exists, we Punt with an obnoxious error message. */ -GNodeList * -Parse_MainName(void) +void +Parse_MainName(GNodeList *mainList) { - GNodeList *mainList; - - mainList = Lst_New(); + if (mainNode == NULL) + Punt("no target to make."); - if (mainNode == NULL) - Punt("no target to make."); - - if (mainNode->type & OP_DOUBLEDEP) { - Lst_Append(mainList, mainNode); - Lst_AppendAll(mainList, mainNode->cohorts); - } else - Lst_Append(mainList, mainNode); - - Var_Append(".TARGETS", mainNode->name, VAR_GLOBAL); + if (mainNode->type & OP_DOUBLEDEP) { + Lst_Append(mainList, mainNode); + Lst_AppendAll(mainList, &mainNode->cohorts); + } else + Lst_Append(mainList, mainNode); - return mainList; + Var_Append(".TARGETS", mainNode->name, VAR_GLOBAL); } int Parse_GetFatals(void) { - return fatals; + return fatals; } diff --git a/pathnames.h b/pathnames.h index 9c597b1e6758..2fdff86c9e7c 100644 --- a/pathnames.h +++ b/pathnames.h @@ -1,62 +1,63 @@ -/* $NetBSD: pathnames.h,v 1.17 2009/04/11 09:41:18 apb Exp $ */ +/* $NetBSD: pathnames.h,v 1.18 2020/11/29 09:27:40 rillig Exp $ */ /* * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * from: @(#)pathnames.h 5.2 (Berkeley) 6/1/90 - * $Id: pathnames.h,v 1.13 2009/08/26 23:43:42 sjg Exp $ + * $Id: pathnames.h,v 1.14 2020/11/30 19:27:41 sjg Exp $ */ #if HAVE_CONFIG_H #include "config.h" #endif #ifndef MAKE_NATIVE #if HAVE_NBTOOL_CONFIG_H #include "nbtool_config.h" #endif #endif #ifdef HAVE_PATHS_H #include #endif -#define _PATH_OBJDIR "obj" -#define _PATH_OBJDIRPREFIX "/usr/obj" + +#define _PATH_OBJDIR "obj" +#define _PATH_OBJDIRPREFIX "/usr/obj" #ifndef _PATH_DEFSHELLDIR -#define _PATH_DEFSHELLDIR "/bin" +#define _PATH_DEFSHELLDIR "/bin" #endif -#define _PATH_DEFSYSMK "sys.mk" +#define _PATH_DEFSYSMK "sys.mk" #define _path_defsyspath "/usr/share/mk:/usr/local/share/mk:/opt/share/mk" #ifndef _PATH_DEFSYSPATH # ifdef _PATH_PREFIX_SYSPATH # define _PATH_DEFSYSPATH _PATH_PREFIX_SYSPATH ":" _path_defsyspath # else # define _PATH_DEFSYSPATH _path_defsyspath # endif #endif #ifndef _PATH_TMP -#define _PATH_TMP "/tmp/" /* with trailing slash */ +#define _PATH_TMP "/tmp/" /* with trailing slash */ #endif diff --git a/str.c b/str.c index 6633482772d3..c2954ec5326d 100644 --- a/str.c +++ b/str.c @@ -1,368 +1,369 @@ -/* $NetBSD: str.c,v 1.74 2020/11/16 18:28:27 rillig Exp $ */ +/* $NetBSD: str.c,v 1.78 2021/01/10 23:59:53 rillig Exp $ */ /*- * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /*- * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include "make.h" /* "@(#)str.c 5.8 (Berkeley) 6/1/90" */ -MAKE_RCSID("$NetBSD: str.c,v 1.74 2020/11/16 18:28:27 rillig Exp $"); +MAKE_RCSID("$NetBSD: str.c,v 1.78 2021/01/10 23:59:53 rillig Exp $"); /* Return the concatenation of s1 and s2, freshly allocated. */ char * str_concat2(const char *s1, const char *s2) { size_t len1 = strlen(s1); size_t len2 = strlen(s2); char *result = bmake_malloc(len1 + len2 + 1); memcpy(result, s1, len1); memcpy(result + len1, s2, len2 + 1); return result; } /* Return the concatenation of s1, s2 and s3, freshly allocated. */ char * str_concat3(const char *s1, const char *s2, const char *s3) { size_t len1 = strlen(s1); size_t len2 = strlen(s2); size_t len3 = strlen(s3); char *result = bmake_malloc(len1 + len2 + len3 + 1); memcpy(result, s1, len1); memcpy(result + len1, s2, len2); memcpy(result + len1 + len2, s3, len3 + 1); return result; } /* Return the concatenation of s1, s2, s3 and s4, freshly allocated. */ char * str_concat4(const char *s1, const char *s2, const char *s3, const char *s4) { size_t len1 = strlen(s1); size_t len2 = strlen(s2); size_t len3 = strlen(s3); size_t len4 = strlen(s4); char *result = bmake_malloc(len1 + len2 + len3 + len4 + 1); memcpy(result, s1, len1); memcpy(result + len1, s2, len2); memcpy(result + len1 + len2, s3, len3); memcpy(result + len1 + len2 + len3, s4, len4 + 1); return result; } -/* Fracture a string into an array of words (as delineated by tabs or spaces) +/* + * Fracture a string into an array of words (as delineated by tabs or spaces) * taking quotation marks into account. * * If expand is TRUE, quotes are removed and escape sequences such as \r, \t, * etc... are expanded. In this case, return NULL on parse errors. * * Returns the fractured words, which must be freed later using Words_Free, * unless the returned Words.words was NULL. */ Words Str_Words(const char *str, Boolean expand) { size_t str_len; char *words_buf; size_t words_cap; char **words; size_t words_len; char inquote; char *word_start; char *word_end; const char *str_p; /* XXX: why only hspace, not whitespace? */ cpp_skip_hspace(&str); /* skip leading space chars. */ /* words_buf holds the words, separated by '\0'. */ str_len = strlen(str); - words_buf = bmake_malloc(strlen(str) + 1); + words_buf = bmake_malloc(str_len + 1); words_cap = str_len / 5 > 50 ? str_len / 5 : 50; words = bmake_malloc((words_cap + 1) * sizeof(char *)); /* * copy the string; at the same time, parse backslashes, * quotes and build the word list. */ words_len = 0; inquote = '\0'; word_start = words_buf; word_end = words_buf; for (str_p = str;; ++str_p) { char ch = *str_p; switch (ch) { case '"': case '\'': - if (inquote) { + if (inquote != '\0') { if (inquote == ch) inquote = '\0'; else break; } else { inquote = ch; /* Don't miss "" or '' */ if (word_start == NULL && str_p[1] == inquote) { if (!expand) { word_start = word_end; *word_end++ = ch; } else word_start = word_end + 1; str_p++; inquote = '\0'; break; } } if (!expand) { if (word_start == NULL) word_start = word_end; *word_end++ = ch; } continue; case ' ': case '\t': case '\n': - if (inquote) + if (inquote != '\0') break; if (word_start == NULL) continue; /* FALLTHROUGH */ case '\0': /* * end of a token -- make sure there's enough words * space and save off a pointer. */ if (word_start == NULL) goto done; *word_end++ = '\0'; if (words_len == words_cap) { size_t new_size; words_cap *= 2; /* ramp up fast */ new_size = (words_cap + 1) * sizeof(char *); words = bmake_realloc(words, new_size); } words[words_len++] = word_start; word_start = NULL; if (ch == '\n' || ch == '\0') { - if (expand && inquote) { + if (expand && inquote != '\0') { free(words); free(words_buf); return (Words){ NULL, 0, NULL }; } goto done; } continue; case '\\': if (!expand) { if (word_start == NULL) word_start = word_end; *word_end++ = '\\'; /* catch '\' at end of line */ if (str_p[1] == '\0') continue; ch = *++str_p; break; } switch (ch = *++str_p) { case '\0': case '\n': /* hmmm; fix it up as best we can */ ch = '\\'; str_p--; break; case 'b': ch = '\b'; break; case 'f': ch = '\f'; break; case 'n': ch = '\n'; break; case 'r': ch = '\r'; break; case 't': ch = '\t'; break; } break; } if (word_start == NULL) word_start = word_end; *word_end++ = ch; } done: words[words_len] = NULL; /* useful for argv */ return (Words){ words, words_len, words_buf }; } /* * Str_Match -- Test if a string matches a pattern like "*.[ch]". * The following special characters are known *?\[] (as in fnmatch(3)). * * XXX: this function does not detect or report malformed patterns. */ Boolean Str_Match(const char *str, const char *pat) { for (;;) { /* * See if we're at the end of both the pattern and the * string. If so, we succeeded. If we're at the end of the * pattern but not at the end of the string, we failed. */ if (*pat == '\0') return *str == '\0'; if (*str == '\0' && *pat != '*') return FALSE; /* * A '*' in the pattern matches any substring. We handle this * by calling ourselves for each suffix of the string. */ if (*pat == '*') { pat++; while (*pat == '*') pat++; if (*pat == '\0') return TRUE; while (*str != '\0') { if (Str_Match(str, pat)) return TRUE; str++; } return FALSE; } /* A '?' in the pattern matches any single character. */ if (*pat == '?') goto thisCharOK; /* * A '[' in the pattern matches a character from a list. * The '[' is followed by the list of acceptable characters, * or by ranges (two characters separated by '-'). In these * character lists, the backslash is an ordinary character. */ if (*pat == '[') { Boolean neg = pat[1] == '^'; pat += neg ? 2 : 1; for (;;) { if (*pat == ']' || *pat == '\0') { if (neg) break; return FALSE; } /* XXX: This naive comparison makes the parser * for the pattern dependent on the actual of * the string. This is unpredictable. */ if (*pat == *str) break; if (pat[1] == '-') { if (pat[2] == '\0') return neg; if (*pat <= *str && pat[2] >= *str) break; if (*pat >= *str && pat[2] <= *str) break; pat += 2; } pat++; } if (neg && *pat != ']' && *pat != '\0') return FALSE; while (*pat != ']' && *pat != '\0') pat++; if (*pat == '\0') pat--; goto thisCharOK; } /* * A backslash in the pattern matches the character following * it exactly. */ if (*pat == '\\') { pat++; if (*pat == '\0') return FALSE; } if (*pat != *str) return FALSE; thisCharOK: pat++; str++; } } diff --git a/suff.c b/suff.c index f0be002cebe1..db9ad982ecef 100644 --- a/suff.c +++ b/suff.c @@ -1,2033 +1,2180 @@ -/* $NetBSD: suff.c,v 1.247 2020/11/16 23:27:41 rillig Exp $ */ +/* $NetBSD: suff.c,v 1.335 2021/01/10 21:20:46 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Maintain suffix lists and find implicit dependents using suffix * transformation rules such as ".c.o". * * Interface: * Suff_Init Initialize the module. * * Suff_End Clean up the module. * * Suff_DoPaths Extend the search path of each suffix to include the * default search path. * * Suff_ClearSuffixes * Clear out all the suffixes and transformations. * * Suff_IsTransform * See if the passed string is a transformation rule. * * Suff_AddSuffix Add the passed string as another known suffix. * * Suff_GetPath Return the search path for the given suffix. * * Suff_AddInclude * Mark the given suffix as denoting an include file. * * Suff_AddLib Mark the given suffix as denoting a library. * * Suff_AddTransform * Add another transformation to the suffix graph. * * Suff_SetNull Define the suffix to consider the suffix of * any file that doesn't have a known one. * * Suff_FindDeps Find implicit sources for and the location of * a target based on its suffix. Returns the * bottom-most node added to the graph or NULL * if the target had no implicit sources. * * Suff_FindPath Return the appropriate path to search in order to * find the node. */ #include "make.h" #include "dir.h" /* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */ -MAKE_RCSID("$NetBSD: suff.c,v 1.247 2020/11/16 23:27:41 rillig Exp $"); +MAKE_RCSID("$NetBSD: suff.c,v 1.335 2021/01/10 21:20:46 rillig Exp $"); -#define SUFF_DEBUG0(text) DEBUG0(SUFF, text) -#define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1) -#define SUFF_DEBUG2(fmt, arg1, arg2) DEBUG2(SUFF, fmt, arg1, arg2) +typedef List SuffixList; +typedef ListNode SuffixListNode; -typedef List SuffList; -typedef ListNode SuffListNode; +typedef List CandidateList; +typedef ListNode CandidateListNode; -typedef List SrcList; -typedef ListNode SrcListNode; - -static SuffList *sufflist; /* List of suffixes */ +/* The defined suffixes, such as '.c', '.o', '.l'. */ +static SuffixList sufflist = LST_INIT; #ifdef CLEANUP -static SuffList *suffClean; /* List of suffixes to be cleaned */ +/* The suffixes to be cleaned up at the end. */ +static SuffixList suffClean = LST_INIT; #endif -static SrcList *srclist; /* List of sources */ - -/* List of transformation rules, such as ".c.o" */ -static GNodeList *transforms; - -static int sNum = 0; /* Counter for assigning suffix numbers */ - -typedef enum SuffFlags { - SUFF_INCLUDE = 0x01, /* One which is #include'd */ - SUFF_LIBRARY = 0x02, /* One which contains a library */ - SUFF_NULL = 0x04 /* The empty suffix */ - /* XXX: Why is SUFF_NULL needed? Wouldn't nameLen == 0 mean the same? */ -} SuffFlags; - -ENUM_FLAGS_RTTI_3(SuffFlags, - SUFF_INCLUDE, SUFF_LIBRARY, SUFF_NULL); - -typedef List SuffListList; - -typedef struct Suff { - /* The suffix itself, such as ".c" */ - char *name; - /* Length of the name, to avoid strlen calls */ - size_t nameLen; - /* Type of suffix */ - SuffFlags flags; - /* The path along which files of this suffix may be found */ - SearchPath *searchPath; - /* The suffix number; TODO: document the purpose of this number */ - int sNum; - /* Reference count of list membership and several other places */ - int refCount; - /* Suffixes we have a transformation to */ - SuffList *parents; - /* Suffixes we have a transformation from */ - SuffList *children; - - /* Lists in which this suffix is referenced. - * XXX: These lists are used nowhere, they are just appended to, for no - * apparent reason. They do have the side effect of increasing refCount - * though. */ - SuffListList *ref; -} Suff; /* - * Structure used in the search for implied sources. + * The transformation rules, such as '.c.o' to transform '.c' into '.o', + * or simply '.c' to transform 'file.c' into 'file'. + */ +static GNodeList transforms = LST_INIT; + +/* + * Counter for assigning suffix numbers. + * TODO: What are these suffix numbers used for? + */ +static int sNum = 0; + +typedef enum SuffixFlags { + SUFF_NONE = 0, + + /* + * This suffix marks include files. Their search path ends up in the + * undocumented special variable '.INCLUDES'. + */ + SUFF_INCLUDE = 1 << 0, + + /* + * This suffix marks library files. Their search path ends up in the + * undocumented special variable '.LIBS'. + */ + SUFF_LIBRARY = 1 << 1, + + /* + * The empty suffix. + * + * XXX: What is the difference between the empty suffix and the null + * suffix? + * + * XXX: Why is SUFF_NULL needed at all? Wouldn't nameLen == 0 mean + * the same? + */ + SUFF_NULL = 1 << 2 + +} SuffixFlags; + +ENUM_FLAGS_RTTI_3(SuffixFlags, + SUFF_INCLUDE, SUFF_LIBRARY, SUFF_NULL); + +typedef List SuffixListList; + +/* + * A suffix such as ".c" or ".o" that is used in suffix transformation rules + * such as ".c.o:". */ -typedef struct Src { - char *file; /* The file to look for */ - char *pref; /* Prefix from which file was formed */ - Suff *suff; /* The suffix on the file */ - struct Src *parent; /* The Src for which this is a source */ - GNode *node; /* The node describing the file */ - int numChildren; /* Count of existing children (so we don't free - * this thing too early or never nuke it) */ +typedef struct Suffix { + /* The suffix itself, such as ".c" */ + char *name; + /* Length of the name, to avoid strlen calls */ + size_t nameLen; + /* Type of suffix */ + SuffixFlags flags; + /* The path along which files of this suffix may be found */ + SearchPath *searchPath; + /* The suffix number; TODO: document the purpose of this number */ + int sNum; + /* Reference count of list membership and several other places */ + int refCount; + /* Suffixes we have a transformation to */ + SuffixList parents; + /* Suffixes we have a transformation from */ + SuffixList children; + + /* Lists in which this suffix is referenced. + * + * XXX: These lists are used nowhere, they are just appended to, for + * no apparent reason. They do have the side effect of increasing + * refCount though. */ + SuffixListList ref; +} Suffix; + +/* + * A candidate when searching for implied sources. + * + * For example, when "src.o" is to be made, a typical candidate is "src.c" + * via the transformation rule ".c.o". If that doesn't exist, maybe there is + * another transformation rule ".pas.c" that would make "src.pas" an indirect + * candidate as well. The first such chain that leads to an existing file or + * node is finally chosen to be made. + */ +typedef struct Candidate { + /* The file or node to look for. */ + char *file; + /* The prefix from which file was formed. + * Its memory is shared among all candidates. */ + char *prefix; + /* The suffix on the file. */ + Suffix *suff; + + /* The candidate that can be made from this, + * or NULL for the top-level candidate. */ + struct Candidate *parent; + /* The node describing the file. */ + GNode *node; + + /* Count of existing children, only used for memory management, so we + * don't free this candidate too early or too late. */ + int numChildren; #ifdef DEBUG_SRC - SrcList *childrenList; + CandidateList childrenList; #endif -} Src; +} Candidate; + +typedef struct CandidateSearcher { + + CandidateList list; + + /* + * TODO: Add HashSet for seen entries, to avoid endless loops such as + * in suff-transform-endless.mk. + */ + +} CandidateSearcher; + -/* TODO: Document the difference between suffNull and emptySuff. */ +/* TODO: Document the difference between nullSuff and emptySuff. */ /* The NULL suffix for this run */ -static Suff *suffNull; +static Suffix *nullSuff; /* The empty suffix required for POSIX single-suffix transformation rules */ -static Suff *emptySuff; +static Suffix *emptySuff; -static void SuffFindDeps(GNode *, SrcList *); -static void SuffExpandWildcards(GNodeListNode *, GNode *); +static Suffix * +Suffix_Ref(Suffix *suff) +{ + suff->refCount++; + return suff; +} + +/* Change the value of a Suffix variable, adjusting the reference counts. */ +static void +Suffix_Reassign(Suffix **var, Suffix *suff) +{ + if (*var != NULL) + (*var)->refCount--; + *var = suff; + suff->refCount++; +} + +/* Set a Suffix variable to NULL, adjusting the reference count. */ +static void +Suffix_Unassign(Suffix **var) +{ + if (*var != NULL) + (*var)->refCount--; + *var = NULL; +} /* * See if pref is a prefix of str. * Return NULL if it ain't, pointer to character in str after prefix if so. */ static const char * -SuffStrIsPrefix(const char *pref, const char *str) +StrTrimPrefix(const char *pref, const char *str) { - while (*str && *pref == *str) { - pref++; - str++; - } + while (*str != '\0' && *pref == *str) { + pref++; + str++; + } - return *pref != '\0' ? NULL : str; + return *pref != '\0' ? NULL : str; } /* - * See if suff is a suffix of name. - * Return NULL if it ain't, pointer to the start of suffix in name if it is. + * See if suff is a suffix of str, and if so, return the pointer to the suffix + * in str, which at the same time marks the end of the prefix. */ static const char * -SuffSuffGetSuffix(const Suff *s, size_t nameLen, const char *nameEnd) +StrTrimSuffix(const char *str, size_t strLen, const char *suff, size_t suffLen) { - const char *p1; /* Pointer into suffix name */ - const char *p2; /* Pointer into string being examined */ + const char *suffInStr; + size_t i; - if (nameLen < s->nameLen) - return NULL; /* this string is shorter than the suffix */ + if (strLen < suffLen) + return NULL; - p1 = s->name + s->nameLen; - p2 = nameEnd; + suffInStr = str + strLen - suffLen; + for (i = 0; i < suffLen; i++) + if (suff[i] != suffInStr[i]) + return NULL; - while (p1 >= s->name && *p1 == *p2) { - p1--; - p2--; - } + return suffInStr; +} - /* XXX: s->name - 1 invokes undefined behavior */ - return p1 == s->name - 1 ? p2 + 1 : NULL; +/* + * See if suff is a suffix of name, and if so, return the end of the prefix + * in name. + */ +static const char * +Suffix_TrimSuffix(const Suffix *suff, size_t nameLen, const char *nameEnd) +{ + return StrTrimSuffix(nameEnd - nameLen, nameLen, + suff->name, suff->nameLen); } static Boolean -SuffSuffIsSuffix(const Suff *suff, size_t nameLen, const char *nameEnd) +Suffix_IsSuffix(const Suffix *suff, size_t nameLen, const char *nameEnd) { - return SuffSuffGetSuffix(suff, nameLen, nameEnd) != NULL; + return Suffix_TrimSuffix(suff, nameLen, nameEnd) != NULL; } -static Suff * -FindSuffByNameLen(const char *name, size_t nameLen) +static Suffix * +FindSuffixByNameLen(const char *name, size_t nameLen) { - SuffListNode *ln; + SuffixListNode *ln; - for (ln = sufflist->first; ln != NULL; ln = ln->next) { - Suff *suff = ln->datum; - if (suff->nameLen == nameLen && memcmp(suff->name, name, nameLen) == 0) - return suff; - } - return NULL; + for (ln = sufflist.first; ln != NULL; ln = ln->next) { + Suffix *suff = ln->datum; + if (suff->nameLen == nameLen && + memcmp(suff->name, name, nameLen) == 0) + return suff; + } + return NULL; } -static Suff * -FindSuffByName(const char *name) +static Suffix * +FindSuffixByName(const char *name) { - return FindSuffByNameLen(name, strlen(name)); + return FindSuffixByNameLen(name, strlen(name)); } static GNode * FindTransformByName(const char *name) { - GNodeListNode *ln; - for (ln = transforms->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; - if (strcmp(gn->name, name) == 0) - return gn; - } - return NULL; + GNodeListNode *ln; + + for (ln = transforms.first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; + if (strcmp(gn->name, name) == 0) + return gn; + } + return NULL; } static void -SuffList_Unref(SuffList *list, Suff *suff) +SuffixList_Unref(SuffixList *list, Suffix *suff) { - SuffListNode *ln = Lst_FindDatum(list, suff); - if (ln != NULL) { - Lst_Remove(list, ln); - suff->refCount--; - } + SuffixListNode *ln = Lst_FindDatum(list, suff); + if (ln != NULL) { + Lst_Remove(list, ln); + suff->refCount--; + } } /* Free up all memory associated with the given suffix structure. */ static void -SuffFree(void *sp) +Suffix_Free(Suffix *suff) { - Suff *suff = sp; - if (suff == suffNull) - suffNull = NULL; + if (suff == nullSuff) + nullSuff = NULL; - if (suff == emptySuff) - emptySuff = NULL; + if (suff == emptySuff) + emptySuff = NULL; #if 0 - /* We don't delete suffixes in order, so we cannot use this */ - if (suff->refCount != 0) - Punt("Internal error deleting suffix `%s' with refcount = %d", - suff->name, suff->refCount); + /* We don't delete suffixes in order, so we cannot use this */ + if (suff->refCount != 0) + Punt("Internal error deleting suffix `%s' with refcount = %d", + suff->name, suff->refCount); #endif - Lst_Free(suff->ref); - Lst_Free(suff->children); - Lst_Free(suff->parents); - Lst_Destroy(suff->searchPath, Dir_Destroy); + Lst_Done(&suff->ref); + Lst_Done(&suff->children); + Lst_Done(&suff->parents); + SearchPath_Free(suff->searchPath); - free(suff->name); - free(suff); + free(suff->name); + free(suff); +} + +static void +SuffFree(void *p) +{ + Suffix_Free(p); } /* Remove the suffix from the list, and free if it is otherwise unused. */ static void -SuffList_Remove(SuffList *list, Suff *suff) +SuffixList_Remove(SuffixList *list, Suffix *suff) { - SuffList_Unref(list, suff); - if (suff->refCount == 0) { - /* XXX: can lead to suff->refCount == -1 */ - SuffList_Unref(sufflist, suff); - SuffFree(suff); - } + SuffixList_Unref(list, suff); + if (suff->refCount == 0) { + /* XXX: can lead to suff->refCount == -1 */ + SuffixList_Unref(&sufflist, suff); + DEBUG1(SUFF, "Removing suffix \"%s\"\n", suff->name); + SuffFree(suff); + } } -/* Insert the suffix into the list, keeping the list ordered by suffix - * number. */ +/* + * Insert the suffix into the list, keeping the list ordered by suffix + * number. + */ static void -SuffList_Insert(SuffList *list, Suff *suff) +SuffixList_Insert(SuffixList *list, Suffix *suff) { - SuffListNode *ln; - Suff *listSuff = NULL; + SuffixListNode *ln; + Suffix *listSuff = NULL; - for (ln = list->first; ln != NULL; ln = ln->next) { - listSuff = ln->datum; - if (listSuff->sNum >= suff->sNum) - break; - } + for (ln = list->first; ln != NULL; ln = ln->next) { + listSuff = ln->datum; + if (listSuff->sNum >= suff->sNum) + break; + } - if (ln == NULL) { - SUFF_DEBUG2("inserting \"%s\" (%d) at end of list\n", + if (ln == NULL) { + DEBUG2(SUFF, "inserting \"%s\" (%d) at end of list\n", suff->name, suff->sNum); - Lst_Append(list, suff); - suff->refCount++; - Lst_Append(suff->ref, list); - } else if (listSuff->sNum != suff->sNum) { - DEBUG4(SUFF, "inserting \"%s\" (%d) before \"%s\" (%d)\n", - suff->name, suff->sNum, listSuff->name, listSuff->sNum); - Lst_InsertBefore(list, ln, suff); - suff->refCount++; - Lst_Append(suff->ref, list); - } else { - SUFF_DEBUG2("\"%s\" (%d) is already there\n", suff->name, suff->sNum); - } + Lst_Append(list, Suffix_Ref(suff)); + Lst_Append(&suff->ref, list); + } else if (listSuff->sNum != suff->sNum) { + DEBUG4(SUFF, "inserting \"%s\" (%d) before \"%s\" (%d)\n", + suff->name, suff->sNum, listSuff->name, listSuff->sNum); + Lst_InsertBefore(list, ln, Suffix_Ref(suff)); + Lst_Append(&suff->ref, list); + } else { + DEBUG2(SUFF, "\"%s\" (%d) is already there\n", + suff->name, suff->sNum); + } } static void -SuffRelate(Suff *srcSuff, Suff *targSuff) +Relate(Suffix *srcSuff, Suffix *targSuff) { - SuffList_Insert(targSuff->children, srcSuff); - SuffList_Insert(srcSuff->parents, targSuff); + SuffixList_Insert(&targSuff->children, srcSuff); + SuffixList_Insert(&srcSuff->parents, targSuff); } -static Suff * -SuffNew(const char *name) +static Suffix * +Suffix_New(const char *name) { - Suff *suff = bmake_malloc(sizeof *suff); - - suff->name = bmake_strdup(name); - suff->nameLen = strlen(suff->name); - suff->searchPath = Lst_New(); - suff->children = Lst_New(); - suff->parents = Lst_New(); - suff->ref = Lst_New(); - suff->sNum = sNum++; - suff->flags = 0; - suff->refCount = 1; /* XXX: why 1? It's not assigned anywhere yet. */ - - return suff; + Suffix *suff = bmake_malloc(sizeof *suff); + + suff->name = bmake_strdup(name); + suff->nameLen = strlen(suff->name); + suff->searchPath = SearchPath_New(); + Lst_Init(&suff->children); + Lst_Init(&suff->parents); + Lst_Init(&suff->ref); + suff->sNum = sNum++; + suff->flags = SUFF_NONE; + suff->refCount = 1; /* XXX: why 1? It's not assigned anywhere yet. */ + + return suff; } /* * Nuke the list of suffixes but keep all transformation rules around. The * transformation graph is destroyed in this process, but we leave the list * of rules so when a new graph is formed, the rules will remain. This * function is called when a line '.SUFFIXES:' with an empty suffixes list is * encountered in a makefile. */ void Suff_ClearSuffixes(void) { #ifdef CLEANUP - Lst_MoveAll(suffClean, sufflist); + Lst_MoveAll(&suffClean, &sufflist); #endif - sufflist = Lst_New(); - sNum = 0; - if (suffNull) - SuffFree(suffNull); - emptySuff = suffNull = SuffNew(""); - - Dir_Concat(suffNull->searchPath, dirSearchPath); - suffNull->flags = SUFF_NULL; + DEBUG0(SUFF, "Clearing all suffixes\n"); + Lst_Init(&sufflist); + sNum = 0; + if (nullSuff != NULL) + SuffFree(nullSuff); + emptySuff = nullSuff = Suffix_New(""); + + SearchPath_AddAll(nullSuff->searchPath, &dirSearchPath); + nullSuff->flags = SUFF_NULL; } -/* Parse a transformation string such as ".c.o" to find its two component +/* + * Parse a transformation string such as ".c.o" to find its two component * suffixes (the source ".c" and the target ".o"). If there are no such * suffixes, try a single-suffix transformation as well. * * Return TRUE if the string is a valid transformation. */ static Boolean -SuffParseTransform(const char *str, Suff **out_src, Suff **out_targ) +ParseTransform(const char *str, Suffix **out_src, Suffix **out_targ) { - SuffListNode *ln; - Suff *singleSrc = NULL; + SuffixListNode *ln; + Suffix *single = NULL; - /* - * Loop looking first for a suffix that matches the start of the - * string and then for one that exactly matches the rest of it. If - * we can find two that meet these criteria, we've successfully - * parsed the string. - */ - for (ln = sufflist->first; ln != NULL; ln = ln->next) { - Suff *src = ln->datum; + /* + * Loop looking first for a suffix that matches the start of the + * string and then for one that exactly matches the rest of it. If + * we can find two that meet these criteria, we've successfully + * parsed the string. + */ + for (ln = sufflist.first; ln != NULL; ln = ln->next) { + Suffix *src = ln->datum; - if (SuffStrIsPrefix(src->name, str) == NULL) - continue; + if (StrTrimPrefix(src->name, str) == NULL) + continue; - if (str[src->nameLen] == '\0') { - singleSrc = src; - } else { - Suff *targ = FindSuffByName(str + src->nameLen); - if (targ != NULL) { - *out_src = src; - *out_targ = targ; - return TRUE; - } + if (str[src->nameLen] == '\0') { + single = src; + } else { + Suffix *targ = FindSuffixByName(str + src->nameLen); + if (targ != NULL) { + *out_src = src; + *out_targ = targ; + return TRUE; + } + } } - } - if (singleSrc != NULL) { - /* - * Not so fast Mr. Smith! There was a suffix that encompassed - * the entire string, so we assume it was a transformation - * to the null suffix (thank you POSIX). We still prefer to - * find a double rule over a singleton, hence we leave this - * check until the end. - * - * XXX: Use emptySuff over suffNull? - */ - *out_src = singleSrc; - *out_targ = suffNull; - return TRUE; - } - return FALSE; + if (single != NULL) { + /* + * There was a suffix that encompassed the entire string, so we + * assume it was a transformation to the null suffix (thank you + * POSIX; search for "single suffix" or "single-suffix"). + * + * We still prefer to find a double rule over a singleton, + * hence we leave this check until the end. + * + * XXX: Use emptySuff over nullSuff? + */ + *out_src = single; + *out_targ = nullSuff; + return TRUE; + } + return FALSE; } -/* Return TRUE if the given string is a transformation rule, that is, a +/* + * Return TRUE if the given string is a transformation rule, that is, a * concatenation of two known suffixes such as ".c.o" or a single suffix - * such as ".o". */ + * such as ".o". + */ Boolean Suff_IsTransform(const char *str) { - Suff *src, *targ; + Suffix *src, *targ; - return SuffParseTransform(str, &src, &targ); + return ParseTransform(str, &src, &targ); } -/* Add the transformation rule to the list of rules and place the +/* + * Add the transformation rule to the list of rules and place the * transformation itself in the graph. * * The transformation is linked to the two suffixes mentioned in the name. * * Input: * name must have the form ".from.to" or just ".from" * * Results: * The created or existing transformation node in the transforms list */ GNode * Suff_AddTransform(const char *name) { - Suff *srcSuff; - Suff *targSuff; + Suffix *srcSuff; + Suffix *targSuff; - GNode *gn = FindTransformByName(name); - if (gn == NULL) { - /* - * Make a new graph node for the transformation. It will be filled in - * by the Parse module. - */ - gn = GNode_New(name); - Lst_Append(transforms, gn); - } else { - /* - * New specification for transformation rule. Just nuke the old list - * of commands so they can be filled in again... We don't actually - * free the commands themselves, because a given command can be - * attached to several different transformations. - */ - Lst_Free(gn->commands); - Lst_Free(gn->children); - gn->commands = Lst_New(); - gn->children = Lst_New(); - } + GNode *gn = FindTransformByName(name); + if (gn == NULL) { + /* + * Make a new graph node for the transformation. It will be + * filled in by the Parse module. + */ + gn = GNode_New(name); + Lst_Append(&transforms, gn); + } else { + /* + * New specification for transformation rule. Just nuke the + * old list of commands so they can be filled in again. We + * don't actually free the commands themselves, because a + * given command can be attached to several different + * transformations. + */ + Lst_Done(&gn->commands); + Lst_Init(&gn->commands); + Lst_Done(&gn->children); + Lst_Init(&gn->children); + } - gn->type = OP_TRANSFORM; + gn->type = OP_TRANSFORM; - { - Boolean ok = SuffParseTransform(name, &srcSuff, &targSuff); - assert(ok); - (void)ok; - } + { + /* TODO: Avoid the redundant parsing here. */ + Boolean ok = ParseTransform(name, &srcSuff, &targSuff); + assert(ok); + (void)ok; + } - /* - * link the two together in the proper relationship and order - */ - SUFF_DEBUG2("defining transformation from `%s' to `%s'\n", - srcSuff->name, targSuff->name); - SuffRelate(srcSuff, targSuff); + /* Link the two together in the proper relationship and order. */ + DEBUG2(SUFF, "defining transformation from `%s' to `%s'\n", + srcSuff->name, targSuff->name); + Relate(srcSuff, targSuff); - return gn; + return gn; } -/* Handle the finish of a transformation definition, removing the +/* + * Handle the finish of a transformation definition, removing the * transformation from the graph if it has neither commands nor sources. * * If the node has no commands or children, the children and parents lists * of the affected suffixes are altered. * * Input: * gn Node for transformation */ void Suff_EndTransform(GNode *gn) { - if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(gn->cohorts)) - gn = gn->cohorts->last->datum; + Suffix *srcSuff, *targSuff; + SuffixList *srcSuffParents; + + if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty(&gn->cohorts)) + gn = gn->cohorts.last->datum; - if ((gn->type & OP_TRANSFORM) && Lst_IsEmpty(gn->commands) && - Lst_IsEmpty(gn->children)) - { - Suff *srcSuff, *targSuff; + if (!(gn->type & OP_TRANSFORM)) + return; + + if (!Lst_IsEmpty(&gn->commands) || !Lst_IsEmpty(&gn->children)) { + DEBUG1(SUFF, "transformation %s complete\n", gn->name); + return; + } /* * SuffParseTransform() may fail for special rules which are not * actual transformation rules. (e.g. .DEFAULT) */ - if (SuffParseTransform(gn->name, &srcSuff, &targSuff)) { - - /* - * Remember parents since srcSuff could be deleted in - * SuffList_Remove - */ - SuffList *srcSuffParents = srcSuff->parents; + if (!ParseTransform(gn->name, &srcSuff, &targSuff)) + return; - SUFF_DEBUG2("deleting transformation from `%s' to `%s'\n", - srcSuff->name, targSuff->name); + DEBUG2(SUFF, "deleting incomplete transformation from `%s' to `%s'\n", + srcSuff->name, targSuff->name); - SuffList_Remove(targSuff->children, srcSuff); - SuffList_Remove(srcSuffParents, targSuff); - } - } else if (gn->type & OP_TRANSFORM) { - SUFF_DEBUG1("transformation %s complete\n", gn->name); - } + /* + * Remember the parents since srcSuff could be deleted in + * SuffixList_Remove. + */ + srcSuffParents = &srcSuff->parents; + SuffixList_Remove(&targSuff->children, srcSuff); + SuffixList_Remove(srcSuffParents, targSuff); } -/* Called from Suff_AddSuffix to search through the list of +/* + * Called from Suff_AddSuffix to search through the list of * existing transformation rules and rebuild the transformation graph when * it has been destroyed by Suff_ClearSuffixes. If the given rule is a * transformation involving this suffix and another, existing suffix, the * proper relationship is established between the two. * * The appropriate links will be made between this suffix and others if * transformation rules exist for it. * * Input: * transform Transformation to test * suff Suffix to rebuild */ static void -SuffRebuildGraph(GNode *transform, Suff *suff) -{ - const char *name = transform->name; - size_t nameLen = strlen(name); - const char *toName; - - /* - * First see if it is a transformation from this suffix. - */ - toName = SuffStrIsPrefix(suff->name, name); - if (toName != NULL) { - Suff *to = FindSuffByName(toName); - if (to != NULL) { - /* Link in and return, since it can't be anything else. */ - SuffRelate(suff, to); - return; +RebuildGraph(GNode *transform, Suffix *suff) +{ + const char *name = transform->name; + size_t nameLen = strlen(name); + const char *toName; + + /* See if it is a transformation from this suffix to another suffix. */ + toName = StrTrimPrefix(suff->name, name); + if (toName != NULL) { + Suffix *to = FindSuffixByName(toName); + if (to != NULL) { + Relate(suff, to); + return; + } } - } - /* - * Not from, maybe to? - */ - toName = SuffSuffGetSuffix(suff, nameLen, name + nameLen); - if (toName != NULL) { - Suff *from = FindSuffByNameLen(name, (size_t)(toName - name)); - if (from != NULL) - SuffRelate(from, suff); - } + /* See if it is a transformation from another suffix to this suffix. */ + toName = Suffix_TrimSuffix(suff, nameLen, name + nameLen); + if (toName != NULL) { + Suffix *from = FindSuffixByNameLen(name, + (size_t)(toName - name)); + if (from != NULL) + Relate(from, suff); + } } -/* During Suff_AddSuffix, search through the list of existing targets and find +/* + * During Suff_AddSuffix, search through the list of existing targets and find * if any of the existing targets can be turned into a transformation rule. * * If such a target is found and the target is the current main target, the * main target is set to NULL and the next target examined (if that exists) * becomes the main target. * * Results: * TRUE iff a new main target has been selected. */ static Boolean -SuffScanTargets(GNode *target, GNode **inout_main, Suff *gs_s, Boolean *gs_r) +UpdateTarget(GNode *target, GNode **inout_main, Suffix *suff, + Boolean *inout_removedMain) { - Suff *srcSuff, *targSuff; - char *ptr; + Suffix *srcSuff, *targSuff; + char *ptr; - if (*inout_main == NULL && *gs_r && !(target->type & OP_NOTARGET)) { - *inout_main = target; - Targ_SetMain(target); - return TRUE; - } + if (*inout_main == NULL && *inout_removedMain && + !(target->type & OP_NOTARGET)) { + DEBUG1(MAKE, "Setting main node to \"%s\"\n", target->name); + *inout_main = target; + Targ_SetMain(target); + /* + * XXX: Why could it be a good idea to return TRUE here? + * The main task of this function is to turn ordinary nodes + * into transformations, no matter whether or not a new .MAIN + * node has been found. + */ + /* + * XXX: Even when changing this to FALSE, none of the existing + * unit tests fails. + */ + return TRUE; + } - if (target->type == OP_TRANSFORM) - return FALSE; + if (target->type == OP_TRANSFORM) + return FALSE; - if ((ptr = strstr(target->name, gs_s->name)) == NULL || - ptr == target->name) - return FALSE; + /* + * XXX: What about a transformation ".cpp.c"? If ".c" is added as + * a new suffix, it seems wrong that this transformation would be + * skipped just because ".c" happens to be a prefix of ".cpp". + */ + ptr = strstr(target->name, suff->name); + if (ptr == NULL) + return FALSE; - if (SuffParseTransform(target->name, &srcSuff, &targSuff)) { - if (*inout_main == target) { - *gs_r = TRUE; - *inout_main = NULL; - Targ_SetMain(NULL); - } - Lst_Free(target->children); - target->children = Lst_New(); - target->type = OP_TRANSFORM; /* - * link the two together in the proper relationship and order + * XXX: In suff-rebuild.mk, in the line '.SUFFIXES: .c .b .a', this + * condition prevents the rule '.b.c' from being added again during + * Suff_AddSuffix(".b"). + * + * XXX: Removing this paragraph makes suff-add-later.mk use massive + * amounts of memory. */ - SUFF_DEBUG2("defining transformation from `%s' to `%s'\n", + if (ptr == target->name) + return FALSE; + + if (ParseTransform(target->name, &srcSuff, &targSuff)) { + if (*inout_main == target) { + DEBUG1(MAKE, + "Setting main node from \"%s\" back to null\n", + target->name); + *inout_removedMain = TRUE; + *inout_main = NULL; + Targ_SetMain(NULL); + } + Lst_Done(&target->children); + Lst_Init(&target->children); + target->type = OP_TRANSFORM; + + /* + * Link the two together in the proper relationship and order. + */ + DEBUG2(SUFF, "defining transformation from `%s' to `%s'\n", srcSuff->name, targSuff->name); - SuffRelate(srcSuff, targSuff); - } - return FALSE; + Relate(srcSuff, targSuff); + } + return FALSE; } -/* Look at all existing targets to see if adding this suffix will make one +/* + * Look at all existing targets to see if adding this suffix will make one * of the current targets mutate into a suffix rule. * * This is ugly, but other makes treat all targets that start with a '.' as - * suffix rules. */ + * suffix rules. + */ static void -UpdateTargets(GNode **inout_main, Suff *s) +UpdateTargets(GNode **inout_main, Suffix *suff) { - Boolean r = FALSE; - GNodeListNode *ln; - for (ln = Targ_List()->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; - if (SuffScanTargets(gn, inout_main, s, &r)) - break; - } + Boolean removedMain = FALSE; + GNodeListNode *ln; + + for (ln = Targ_List()->first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; + if (UpdateTarget(gn, inout_main, suff, &removedMain)) + break; + } } -/* Add the suffix to the end of the list of known suffixes. - * Should we restructure the suffix graph? Make doesn't... +/* + * Add the suffix to the end of the list of known suffixes. + * Should we restructure the suffix graph? Make doesn't. * - * A GNode is created for the suffix and a Suff structure is created and - * added to the suffixes list unless the suffix was already known. + * A GNode is created for the suffix (XXX: this sounds completely wrong) and + * a Suffix structure is created and added to the suffixes list unless the + * suffix was already known. * The mainNode passed can be modified if a target mutated into a * transform and that target happened to be the main target. * * Input: * name the name of the suffix to add */ void Suff_AddSuffix(const char *name, GNode **inout_main) { - GNodeListNode *ln; + GNodeListNode *ln; - Suff *s = FindSuffByName(name); - if (s != NULL) - return; + Suffix *suff = FindSuffixByName(name); + if (suff != NULL) + return; - s = SuffNew(name); - Lst_Append(sufflist, s); + suff = Suffix_New(name); + Lst_Append(&sufflist, suff); + DEBUG1(SUFF, "Adding suffix \"%s\"\n", suff->name); - UpdateTargets(inout_main, s); + UpdateTargets(inout_main, suff); - /* - * Look for any existing transformations from or to this suffix. - * XXX: Only do this after a Suff_ClearSuffixes? - */ - for (ln = transforms->first; ln != NULL; ln = ln->next) - SuffRebuildGraph(ln->datum, s); + /* + * Look for any existing transformations from or to this suffix. + * XXX: Only do this after a Suff_ClearSuffixes? + */ + for (ln = transforms.first; ln != NULL; ln = ln->next) + RebuildGraph(ln->datum, suff); } /* Return the search path for the given suffix, or NULL. */ SearchPath * Suff_GetPath(const char *sname) { - Suff *s = FindSuffByName(sname); - return s != NULL ? s->searchPath : NULL; + Suffix *suff = FindSuffixByName(sname); + return suff != NULL ? suff->searchPath : NULL; } /* * Extend the search paths for all suffixes to include the default search * path (dirSearchPath). * * The default search path can be defined using the special target '.PATH'. * The search path of each suffix can be defined using the special target * '.PATH'. * * If paths were specified for the ".h" suffix, the directories are stuffed * into a global variable called ".INCLUDES" with each directory preceded by * '-I'. The same is done for the ".a" suffix, except the variable is called * ".LIBS" and the flag is '-L'. */ void Suff_DoPaths(void) { - SuffListNode *ln; - char *ptr; - SearchPath *inIncludes; /* Cumulative .INCLUDES path */ - SearchPath *inLibs; /* Cumulative .LIBS path */ - - inIncludes = Lst_New(); - inLibs = Lst_New(); - - for (ln = sufflist->first; ln != NULL; ln = ln->next) { - Suff *s = ln->datum; - if (!Lst_IsEmpty(s->searchPath)) { + SuffixListNode *ln; + char *flags; + SearchPath *includesPath = SearchPath_New(); + SearchPath *libsPath = SearchPath_New(); + + for (ln = sufflist.first; ln != NULL; ln = ln->next) { + Suffix *suff = ln->datum; + if (!Lst_IsEmpty(suff->searchPath)) { #ifdef INCLUDES - if (s->flags & SUFF_INCLUDE) - Dir_Concat(inIncludes, s->searchPath); + if (suff->flags & SUFF_INCLUDE) + SearchPath_AddAll(includesPath, + suff->searchPath); #endif #ifdef LIBRARIES - if (s->flags & SUFF_LIBRARY) - Dir_Concat(inLibs, s->searchPath); + if (suff->flags & SUFF_LIBRARY) + SearchPath_AddAll(libsPath, suff->searchPath); #endif - Dir_Concat(s->searchPath, dirSearchPath); - } else { - Lst_Destroy(s->searchPath, Dir_Destroy); - s->searchPath = Dir_CopyDirSearchPath(); + SearchPath_AddAll(suff->searchPath, &dirSearchPath); + } else { + SearchPath_Free(suff->searchPath); + suff->searchPath = Dir_CopyDirSearchPath(); + } } - } - Var_Set(".INCLUDES", ptr = Dir_MakeFlags("-I", inIncludes), VAR_GLOBAL); - free(ptr); - Var_Set(".LIBS", ptr = Dir_MakeFlags("-L", inLibs), VAR_GLOBAL); - free(ptr); + flags = SearchPath_ToFlags("-I", includesPath); + Var_Set(".INCLUDES", flags, VAR_GLOBAL); + free(flags); + + flags = SearchPath_ToFlags("-L", libsPath); + Var_Set(".LIBS", flags, VAR_GLOBAL); + free(flags); - Lst_Destroy(inIncludes, Dir_Destroy); - Lst_Destroy(inLibs, Dir_Destroy); + SearchPath_Free(includesPath); + SearchPath_Free(libsPath); } -/* Add the given suffix as a type of file which gets included. - * Called from the parse module when a .INCLUDES line is parsed. - * The suffix must have already been defined. - * The SUFF_INCLUDE bit is set in the suffix's flags field. - * - * Input: - * sname Name of the suffix to mark +/* + * Add the given suffix as a type of file which gets included. + * Called when a '.INCLUDES: .h' line is parsed. + * To have an effect, the suffix must already exist. + * This affects the magic variable '.INCLUDES'. */ void -Suff_AddInclude(const char *sname) +Suff_AddInclude(const char *suffName) { - Suff *suff = FindSuffByName(sname); - if (suff != NULL) - suff->flags |= SUFF_INCLUDE; + Suffix *suff = FindSuffixByName(suffName); + if (suff != NULL) + suff->flags |= SUFF_INCLUDE; } -/* Add the given suffix as a type of file which is a library. - * Called from the parse module when parsing a .LIBS line. - * The suffix must have been defined via .SUFFIXES before this is called. - * The SUFF_LIBRARY bit is set in the suffix's flags field. - * - * Input: - * sname Name of the suffix to mark +/* + * Add the given suffix as a type of file which is a library. + * Called when a '.LIBS: .a' line is parsed. + * To have an effect, the suffix must already exist. + * This affects the magic variable '.LIBS'. */ void -Suff_AddLib(const char *sname) +Suff_AddLib(const char *suffName) +{ + Suffix *suff = FindSuffixByName(suffName); + if (suff != NULL) + suff->flags |= SUFF_LIBRARY; +} + +/********** Implicit Source Search Functions *********/ + +static void +CandidateSearcher_Init(CandidateSearcher *cs) { - Suff *suff = FindSuffByName(sname); - if (suff != NULL) - suff->flags |= SUFF_LIBRARY; + Lst_Init(&cs->list); +} + +static void +CandidateSearcher_Done(CandidateSearcher *cs) +{ + Lst_Done(&cs->list); +} + +static void +CandidateSearcher_Add(CandidateSearcher *cs, Candidate *cand) +{ + /* TODO: filter duplicates */ + Lst_Append(&cs->list, cand); +} + +static void +CandidateSearcher_AddIfNew(CandidateSearcher *cs, Candidate *cand) +{ + /* TODO: filter duplicates */ + if (Lst_FindDatum(&cs->list, cand) == NULL) + Lst_Append(&cs->list, cand); +} + +static void +CandidateSearcher_MoveAll(CandidateSearcher *cs, CandidateList *list) +{ + /* TODO: filter duplicates */ + Lst_MoveAll(&cs->list, list); } - /********** Implicit Source Search Functions *********/ #ifdef DEBUG_SRC static void -SrcList_PrintAddrs(SrcList *srcList) +CandidateList_PrintAddrs(CandidateList *list) { - SrcListNode *ln; - for (ln = srcList->first; ln != NULL; ln = ln->next) - debug_printf(" %p", ln->datum); - debug_printf("\n"); + CandidateListNode *ln; + + for (ln = list->first; ln != NULL; ln = ln->next) { + Candidate *cand = ln->datum; + debug_printf(" %p:%s", cand, cand->file); + } + debug_printf("\n"); } #endif -static Src * -SrcNew(char *name, char *pref, Suff *suff, Src *parent, GNode *gn) +static Candidate * +Candidate_New(char *name, char *prefix, Suffix *suff, Candidate *parent, + GNode *gn) { - Src *src = bmake_malloc(sizeof *src); - - src->file = name; - src->pref = pref; - src->suff = suff; - src->parent = parent; - src->node = gn; - src->numChildren = 0; + Candidate *cand = bmake_malloc(sizeof *cand); + + cand->file = name; + cand->prefix = prefix; + cand->suff = Suffix_Ref(suff); + cand->parent = parent; + cand->node = gn; + cand->numChildren = 0; #ifdef DEBUG_SRC - src->childrenList = Lst_New(); + Lst_Init(&cand->childrenList); #endif - return src; + return cand; } +/* Add a new candidate to the list. */ +/*ARGSUSED*/ static void -SuffAddSrc(Suff *suff, SrcList *srcList, Src *targ, char *srcName, - const char *debug_tag MAKE_ATTR_UNUSED) +CandidateList_Add(CandidateList *list, char *srcName, Candidate *targ, + Suffix *suff, const char *debug_tag) { - Src *s2 = SrcNew(srcName, targ->pref, suff, targ, NULL); - suff->refCount++; - targ->numChildren++; - Lst_Append(srcList, s2); + Candidate *cand = Candidate_New(srcName, targ->prefix, suff, targ, + NULL); + targ->numChildren++; + Lst_Append(list, cand); + #ifdef DEBUG_SRC - Lst_Append(targ->childrenList, s2); - debug_printf("%s add suff %p src %p to list %p:", - debug_tag, targ, s2, srcList); - SrcList_PrintAddrs(srcList); + Lst_Append(&targ->childrenList, cand); + debug_printf("%s add suff %p:%s candidate %p:%s to list %p:", + debug_tag, targ, targ->file, cand, cand->file, list); + CandidateList_PrintAddrs(list); #endif } -/* Add a suffix as a Src structure to the given list with its parent - * being the given Src structure. If the suffix is the null suffix, - * the prefix is used unaltered as the filename in the Src structure. - * - * Input: - * suff suffix for which to create a Src structure - * srcList list for the new Src - * targ parent for the new Src +/* + * Add all candidates to the list that can be formed by applying a suffix to + * the candidate. */ static void -SuffAddSources(Suff *suff, SrcList *srcList, Src *targ) +CandidateList_AddCandidatesFor(CandidateList *list, Candidate *cand) { - if ((suff->flags & SUFF_NULL) && suff->name[0] != '\0') { - /* - * If the suffix has been marked as the NULL suffix, also create a Src - * structure for a file with no suffix attached. Two birds, and all - * that... - */ - SuffAddSrc(suff, srcList, targ, bmake_strdup(targ->pref), "1"); - } - SuffAddSrc(suff, srcList, targ, str_concat2(targ->pref, suff->name), "2"); -} + SuffixListNode *ln; + for (ln = cand->suff->children.first; ln != NULL; ln = ln->next) { + Suffix *suff = ln->datum; + + if ((suff->flags & SUFF_NULL) && suff->name[0] != '\0') { + /* + * If the suffix has been marked as the NULL suffix, + * also create a candidate for a file with no suffix + * attached. + */ + CandidateList_Add(list, bmake_strdup(cand->prefix), + cand, suff, "1"); + } -/* Add all the children of targ to the list. */ -static void -SuffAddLevel(SrcList *srcs, Src *targ) -{ - SrcListNode *ln; - for (ln = targ->suff->children->first; ln != NULL; ln = ln->next) { - Suff *childSuff = ln->datum; - SuffAddSources(childSuff, srcs, targ); - } + CandidateList_Add(list, str_concat2(cand->prefix, suff->name), + cand, suff, "2"); + } } -/* Free the first Src in the list that is not referenced anymore. - * Return whether a Src was removed. */ +/* + * Free the first candidate in the list that is not referenced anymore. + * Return whether a candidate was removed. + */ static Boolean -SuffRemoveSrc(SrcList *l) +RemoveCandidate(CandidateList *srcs) { - SrcListNode *ln; + CandidateListNode *ln; #ifdef DEBUG_SRC - debug_printf("cleaning list %p:", l); - SrcList_PrintAddrs(l); + debug_printf("cleaning list %p:", srcs); + CandidateList_PrintAddrs(srcs); #endif - for (ln = l->first; ln != NULL; ln = ln->next) { - Src *src = ln->datum; + for (ln = srcs->first; ln != NULL; ln = ln->next) { + Candidate *src = ln->datum; - if (src->numChildren == 0) { - free(src->file); - if (src->parent == NULL) - free(src->pref); - else { + if (src->numChildren == 0) { + if (src->parent == NULL) + free(src->prefix); + else { #ifdef DEBUG_SRC - SrcListNode *ln2 = Lst_FindDatum(src->parent->childrenList, src); - if (ln2 != NULL) - Lst_Remove(src->parent->childrenList, ln2); + /* XXX: Lst_RemoveDatum */ + CandidateListNode *ln2; + ln2 = Lst_FindDatum(&src->parent->childrenList, + src); + if (ln2 != NULL) + Lst_Remove(&src->parent->childrenList, + ln2); #endif - src->parent->numChildren--; - } + src->parent->numChildren--; + } #ifdef DEBUG_SRC - debug_printf("free: list %p src %p children %d\n", - l, src, src->children); - Lst_Free(src->childrenList); + debug_printf("free: list %p src %p:%s children %d\n", + srcs, src, src->file, src->numChildren); + Lst_Done(&src->childrenList); #endif - Lst_Remove(l, ln); - free(src); - return TRUE; - } + Lst_Remove(srcs, ln); + free(src->file); + free(src); + return TRUE; + } #ifdef DEBUG_SRC - else { - debug_printf("keep: list %p src %p children %d:", - l, src, src->children); - SrcList_PrintAddrs(src->childrenList); - } + else { + debug_printf("keep: list %p src %p:%s children %d:", + srcs, src, src->file, src->numChildren); + CandidateList_PrintAddrs(&src->childrenList); + } #endif - } + } - return FALSE; + return FALSE; } /* Find the first existing file/target in srcs. */ -static Src * -SuffFindThem(SrcList *srcs, SrcList *slst) +static Candidate * +FindThem(CandidateList *srcs, CandidateSearcher *cs) { - Src *retsrc = NULL; + HashSet seen; - while (!Lst_IsEmpty(srcs)) { - Src *src = Lst_Dequeue(srcs); + HashSet_Init(&seen); - SUFF_DEBUG1("\ttrying %s...", src->file); + while (!Lst_IsEmpty(srcs)) { + Candidate *src = Lst_Dequeue(srcs); - /* - * A file is considered to exist if either a node exists in the - * graph for it or the file actually exists. - */ - if (Targ_FindNode(src->file) != NULL) { #ifdef DEBUG_SRC - debug_printf("remove from list %p src %p\n", srcs, src); + debug_printf("remove from list %p src %p:%s\n", + srcs, src, src->file); #endif - retsrc = src; - break; - } + DEBUG1(SUFF, "\ttrying %s...", src->file); - { - char *file = Dir_FindFile(src->file, src->suff->searchPath); - if (file != NULL) { - retsrc = src; -#ifdef DEBUG_SRC - debug_printf("remove from list %p src %p\n", srcs, src); -#endif - free(file); - break; - } - } + /* + * A file is considered to exist if either a node exists in the + * graph for it or the file actually exists. + */ + if (Targ_FindNode(src->file) != NULL) { + found: + HashSet_Done(&seen); + DEBUG0(SUFF, "got it\n"); + return src; + } - SUFF_DEBUG0("not there\n"); + { + char *file = Dir_FindFile(src->file, + src->suff->searchPath); + if (file != NULL) { + free(file); + goto found; + } + } - SuffAddLevel(srcs, src); - Lst_Append(slst, src); - } + DEBUG0(SUFF, "not there\n"); - if (retsrc) { - SUFF_DEBUG0("got it\n"); - } - return retsrc; + if (HashSet_Add(&seen, src->file)) + CandidateList_AddCandidatesFor(srcs, src); + else { + DEBUG1(SUFF, "FindThem: skipping duplicate \"%s\"\n", + src->file); + } + + CandidateSearcher_Add(cs, src); + } + + HashSet_Done(&seen); + return NULL; } -/* See if any of the children of the target in the Src structure is one from - * which the target can be transformed. If there is one, a Src structure is - * put together for it and returned. - * - * Input: - * targ Src to play with - * - * Results: - * The Src of the "winning" child, or NULL. +/* + * See if any of the children of the candidate's GNode is one from which the + * target can be transformed. If there is one, a candidate is put together + * for it and returned. */ -static Src * -SuffFindCmds(Src *targ, SrcList *slst) -{ - GNodeListNode *gln; - GNode *tgn; /* Target GNode */ - GNode *sgn; /* Source GNode */ - size_t prefLen; /* The length of the defined prefix */ - Suff *suff; /* Suffix on matching beastie */ - Src *ret; /* Return value */ - char *cp; - - tgn = targ->node; - prefLen = strlen(targ->pref); - - for (gln = tgn->children->first; gln != NULL; gln = gln->next) { - sgn = gln->datum; - - if (sgn->type & OP_OPTIONAL && Lst_IsEmpty(tgn->commands)) { - /* - * We haven't looked to see if .OPTIONAL files exist yet, so - * don't use one as the implicit source. - * This allows us to use .OPTIONAL in .depend files so make won't - * complain "don't know how to make xxx.h' when a dependent file - * has been moved/deleted. - */ - continue; - } +static Candidate * +FindCmds(Candidate *targ, CandidateSearcher *cs) +{ + GNodeListNode *gln; + GNode *tgn; /* Target GNode */ + GNode *sgn; /* Source GNode */ + size_t prefLen; /* The length of the defined prefix */ + Suffix *suff; /* Suffix on matching beastie */ + Candidate *ret; /* Return value */ + + tgn = targ->node; + prefLen = strlen(targ->prefix); + + for (gln = tgn->children.first; gln != NULL; gln = gln->next) { + const char *cp; + + sgn = gln->datum; + + if (sgn->type & OP_OPTIONAL && Lst_IsEmpty(&tgn->commands)) { + /* + * We haven't looked to see if .OPTIONAL files exist + * yet, so don't use one as the implicit source. + * This allows us to use .OPTIONAL in .depend files so + * make won't complain "don't know how to make xxx.h" + * when a dependent file has been moved/deleted. + */ + continue; + } - cp = strrchr(sgn->name, '/'); - if (cp == NULL) { - cp = sgn->name; - } else { - cp++; + cp = str_basename(sgn->name); + if (strncmp(cp, targ->prefix, prefLen) != 0) + continue; + /* The node matches the prefix, see if it has a known suffix. */ + suff = FindSuffixByName(cp + prefLen); + if (suff == NULL) + continue; + + /* + * It even has a known suffix, see if there's a transformation + * defined between the node's suffix and the target's suffix. + * + * XXX: Handle multi-stage transformations here, too. + */ + + if (Lst_FindDatum(&suff->parents, targ->suff) != NULL) + break; } - if (strncmp(cp, targ->pref, prefLen) != 0) - continue; - /* The node matches the prefix ok, see if it has a known suffix. */ - suff = FindSuffByName(cp + prefLen); - if (suff == NULL) - continue; + + if (gln == NULL) + return NULL; + + ret = Candidate_New(bmake_strdup(sgn->name), targ->prefix, suff, targ, + sgn); + targ->numChildren++; +#ifdef DEBUG_SRC + debug_printf("3 add targ %p:%s ret %p:%s\n", + targ, targ->file, ret, ret->file); + Lst_Append(&targ->childrenList, ret); +#endif + CandidateSearcher_Add(cs, ret); + DEBUG1(SUFF, "\tusing existing source %s\n", sgn->name); + return ret; +} + +static void +ExpandWildcards(GNodeListNode *cln, GNode *pgn) +{ + GNode *cgn = cln->datum; + StringList expansions; + + if (!Dir_HasWildcards(cgn->name)) + return; /* - * It even has a known suffix, see if there's a transformation - * defined between the node's suffix and the target's suffix. - * - * XXX: Handle multi-stage transformations here, too. + * Expand the word along the chosen path */ + Lst_Init(&expansions); + Dir_Expand(cgn->name, Suff_FindPath(cgn), &expansions); - /* XXX: Can targ->suff be NULL here? */ - if (targ->suff != NULL && - Lst_FindDatum(suff->parents, targ->suff) != NULL) - break; - } + while (!Lst_IsEmpty(&expansions)) { + GNode *gn; + /* + * Fetch next expansion off the list and find its GNode + */ + char *cp = Lst_Dequeue(&expansions); - if (gln == NULL) - return NULL; + DEBUG1(SUFF, "%s...", cp); + gn = Targ_GetNode(cp); - /* - * Hot Damn! Create a new Src structure to describe - * this transformation (making sure to duplicate the - * source node's name so Suff_FindDeps can free it - * again (ick)), and return the new structure. - */ - ret = SrcNew(bmake_strdup(sgn->name), targ->pref, suff, targ, sgn); - suff->refCount++; - targ->numChildren++; -#ifdef DEBUG_SRC - debug_printf("3 add targ %p ret %p\n", targ, ret); - Lst_Append(targ->childrenList, ret); -#endif - Lst_Append(slst, ret); - SUFF_DEBUG1("\tusing existing source %s\n", sgn->name); - return ret; + /* Add gn to the parents child list before the original child */ + Lst_InsertBefore(&pgn->children, cln, gn); + Lst_Append(&gn->parents, pgn); + pgn->unmade++; + } + + Lst_Done(&expansions); + + DEBUG0(SUFF, "\n"); + + /* + * Now the source is expanded, remove it from the list of children to + * keep it from being processed. + */ + pgn->unmade--; + Lst_Remove(&pgn->children, cln); + Lst_Remove(&cgn->parents, Lst_FindDatum(&cgn->parents, pgn)); } -/* Expand the names of any children of a given node that contain variable - * expressions or file wildcards into actual targets. - * - * The expanded node is removed from the parent's list of children, and the - * parent's unmade counter is decremented, but other nodes may be added. +/* + * Break the result into a vector of strings whose nodes we can find, then + * add those nodes to the members list. * - * Input: - * cln Child to examine - * pgn Parent node being processed + * Unfortunately, we can't use Str_Words because it doesn't understand about + * variable specifications with spaces in them. */ static void -SuffExpandChildren(GNodeListNode *cln, GNode *pgn) -{ - GNode *cgn = cln->datum; - GNode *gn; /* New source 8) */ - char *cp; /* Expanded value */ - - if (!Lst_IsEmpty(cgn->order_pred) || !Lst_IsEmpty(cgn->order_succ)) - /* It is all too hard to process the result of .ORDER */ - return; - - if (cgn->type & OP_WAIT) - /* Ignore these (& OP_PHONY ?) */ - return; - - /* - * First do variable expansion -- this takes precedence over - * wildcard expansion. If the result contains wildcards, they'll be gotten - * to later since the resulting words are tacked on to the end of - * the children list. - */ - if (strchr(cgn->name, '$') == NULL) { - SuffExpandWildcards(cln, pgn); - return; - } - - SUFF_DEBUG1("Expanding \"%s\"...", cgn->name); - (void)Var_Subst(cgn->name, pgn, VARE_WANTRES | VARE_UNDEFERR, &cp); - /* TODO: handle errors */ - - { - GNodeList *members = Lst_New(); - - if (cgn->type & OP_ARCHV) { - /* - * Node was an archive(member) target, so we want to call - * on the Arch module to find the nodes for us, expanding - * variables in the parent's context. - */ - char *sacrifice = cp; - - (void)Arch_ParseArchive(&sacrifice, members, pgn); - } else { - /* - * Break the result into a vector of strings whose nodes - * we can find, then add those nodes to the members list. - * Unfortunately, we can't use Str_Words because it - * doesn't understand about variable specifications with - * spaces in them... - */ - char *start; - char *initcp = cp; /* For freeing... */ - - start = cp; - pp_skip_hspace(&start); - cp = start; - while (*cp != '\0') { +ExpandChildrenRegular(char *cp, GNode *pgn, GNodeList *members) +{ + char *start; + + pp_skip_hspace(&cp); + start = cp; + while (*cp != '\0') { if (*cp == ' ' || *cp == '\t') { - /* - * White-space -- terminate element, find the node, - * add it, skip any further spaces. - */ - *cp++ = '\0'; - gn = Targ_GetNode(start); - Lst_Append(members, gn); - pp_skip_hspace(&cp); - start = cp; /* Continue at the next non-space. */ + GNode *gn; + /* + * White-space -- terminate element, find the node, + * add it, skip any further spaces. + */ + *cp++ = '\0'; + gn = Targ_GetNode(start); + Lst_Append(members, gn); + pp_skip_hspace(&cp); + /* Continue at the next non-space. */ + start = cp; } else if (*cp == '$') { - /* - * Start of a variable spec -- contact variable module - * to find the end so we can skip over it. - */ - const char *nested_p = cp; - const char *junk; - void *freeIt; - - /* XXX: Why VARE_WANTRES when the result is not used? */ - (void)Var_Parse(&nested_p, pgn, - VARE_WANTRES | VARE_UNDEFERR, - &junk, &freeIt); - /* TODO: handle errors */ - if (junk == var_Error) { - Parse_Error(PARSE_FATAL, + /* Skip over the variable expression. */ + const char *nested_p = cp; + FStr junk; + + (void)Var_Parse(&nested_p, pgn, VARE_NONE, &junk); + /* TODO: handle errors */ + if (junk.str == var_Error) { + Parse_Error(PARSE_FATAL, "Malformed variable expression at \"%s\"", cp); - cp++; - } else { - cp += nested_p - cp; - } + cp++; + } else { + cp += nested_p - cp; + } - free(freeIt); + FStr_Done(&junk); } else if (cp[0] == '\\' && cp[1] != '\0') { - /* - * Escaped something -- skip over it - */ - /* XXX: In other places, escaping at this syntactical - * position is done by a '$', not a '\'. The '\' is only - * used in variable modifiers. */ - cp += 2; + /* Escaped something -- skip over it. */ + /* + * XXX: In other places, escaping at this syntactical + * position is done by a '$', not a '\'. The '\' is + * only used in variable modifiers. + */ + cp += 2; } else { - cp++; + cp++; } - } + } - if (cp != start) { + if (cp != start) { /* * Stuff left over -- add it to the list too */ - gn = Targ_GetNode(start); + GNode *gn = Targ_GetNode(start); Lst_Append(members, gn); - } - /* - * Point cp back at the beginning again so the variable value - * can be freed. - */ - cp = initcp; - } - - /* - * Add all elements of the members list to the parent node. - */ - while(!Lst_IsEmpty(members)) { - gn = Lst_Dequeue(members); - - SUFF_DEBUG1("%s...", gn->name); - /* Add gn to the parents child list before the original child */ - Lst_InsertBefore(pgn->children, cln, gn); - Lst_Append(gn->parents, pgn); - pgn->unmade++; - /* Expand wildcards on new node */ - SuffExpandWildcards(cln->prev, pgn); } - Lst_Free(members); - - /* - * Free the result - */ - free(cp); - } - - SUFF_DEBUG0("\n"); - - /* - * Now the source is expanded, remove it from the list of children to - * keep it from being processed. - */ - pgn->unmade--; - Lst_Remove(pgn->children, cln); - Lst_Remove(cgn->parents, Lst_FindDatum(cgn->parents, pgn)); } +/* + * Expand the names of any children of a given node that contain variable + * expressions or file wildcards into actual targets. + * + * The expanded node is removed from the parent's list of children, and the + * parent's unmade counter is decremented, but other nodes may be added. + * + * Input: + * cln Child to examine + * pgn Parent node being processed + */ static void -SuffExpandWildcards(GNodeListNode *cln, GNode *pgn) +ExpandChildren(GNodeListNode *cln, GNode *pgn) { - GNode *cgn = cln->datum; - StringList *expansions; + GNode *cgn = cln->datum; + char *cp; /* Expanded value */ - if (!Dir_HasWildcards(cgn->name)) - return; + if (!Lst_IsEmpty(&cgn->order_pred) || !Lst_IsEmpty(&cgn->order_succ)) + /* It is all too hard to process the result of .ORDER */ + return; - /* - * Expand the word along the chosen path - */ - expansions = Lst_New(); - Dir_Expand(cgn->name, Suff_FindPath(cgn), expansions); + if (cgn->type & OP_WAIT) + /* Ignore these (& OP_PHONY ?) */ + return; - while (!Lst_IsEmpty(expansions)) { - GNode *gn; /* - * Fetch next expansion off the list and find its GNode + * First do variable expansion -- this takes precedence over wildcard + * expansion. If the result contains wildcards, they'll be gotten to + * later since the resulting words are tacked on to the end of the + * children list. */ - char *cp = Lst_Dequeue(expansions); + if (strchr(cgn->name, '$') == NULL) { + ExpandWildcards(cln, pgn); + return; + } - SUFF_DEBUG1("%s...", cp); - gn = Targ_GetNode(cp); + DEBUG1(SUFF, "Expanding \"%s\"...", cgn->name); + (void)Var_Subst(cgn->name, pgn, VARE_WANTRES | VARE_UNDEFERR, &cp); + /* TODO: handle errors */ - /* Add gn to the parents child list before the original child */ - Lst_InsertBefore(pgn->children, cln, gn); - Lst_Append(gn->parents, pgn); - pgn->unmade++; - } + { + GNodeList members = LST_INIT; + + if (cgn->type & OP_ARCHV) { + /* + * Node was an archive(member) target, so we want to + * call on the Arch module to find the nodes for us, + * expanding variables in the parent's context. + */ + char *p = cp; + (void)Arch_ParseArchive(&p, &members, pgn); + } else { + ExpandChildrenRegular(cp, pgn, &members); + } - Lst_Free(expansions); + /* + * Add all elements of the members list to the parent node. + */ + while (!Lst_IsEmpty(&members)) { + GNode *gn = Lst_Dequeue(&members); + + DEBUG1(SUFF, "%s...", gn->name); + /* + * Add gn to the parents child list before the + * original child. + */ + Lst_InsertBefore(&pgn->children, cln, gn); + Lst_Append(&gn->parents, pgn); + pgn->unmade++; + /* Expand wildcards on new node */ + ExpandWildcards(cln->prev, pgn); + } + Lst_Done(&members); - SUFF_DEBUG0("\n"); + free(cp); + } + + DEBUG0(SUFF, "\n"); - /* - * Now the source is expanded, remove it from the list of children to - * keep it from being processed. - */ - pgn->unmade--; - Lst_Remove(pgn->children, cln); - Lst_Remove(cgn->parents, Lst_FindDatum(cgn->parents, pgn)); + /* + * Now the source is expanded, remove it from the list of children to + * keep it from being processed. + */ + pgn->unmade--; + Lst_Remove(&pgn->children, cln); + Lst_Remove(&cgn->parents, Lst_FindDatum(&cgn->parents, pgn)); +} + +static void +ExpandAllChildren(GNode *gn) +{ + GNodeListNode *ln, *nln; + + for (ln = gn->children.first; ln != NULL; ln = nln) { + nln = ln->next; + ExpandChildren(ln, gn); + } } -/* Find a path along which to expand the node. +/* + * Find a path along which to expand the node. * * If the node has a known suffix, use that path. * If it has no known suffix, use the default system search path. * * Input: * gn Node being examined * * Results: * The appropriate path to search for the GNode. */ SearchPath * -Suff_FindPath(GNode* gn) -{ - Suff *suff = gn->suffix; - - if (suff == NULL) { - char *name = gn->name; - size_t nameLen = strlen(gn->name); - SuffListNode *ln; - for (ln = sufflist->first; ln != NULL; ln = ln->next) - if (SuffSuffIsSuffix(ln->datum, nameLen, name + nameLen)) - break; - - SUFF_DEBUG1("Wildcard expanding \"%s\"...", gn->name); - if (ln != NULL) - suff = ln->datum; - /* XXX: Here we can save the suffix so we don't have to do this again */ - } - - if (suff != NULL) { - SUFF_DEBUG1("suffix is \"%s\"...\n", suff->name); - return suff->searchPath; - } else { - SUFF_DEBUG0("\n"); - return dirSearchPath; /* Use default search path */ - } -} - -/* Apply a transformation rule, given the source and target nodes and +Suff_FindPath(GNode *gn) +{ + Suffix *suff = gn->suffix; + + if (suff == NULL) { + char *name = gn->name; + size_t nameLen = strlen(gn->name); + SuffixListNode *ln; + for (ln = sufflist.first; ln != NULL; ln = ln->next) + if (Suffix_IsSuffix(ln->datum, nameLen, name + nameLen)) + break; + + DEBUG1(SUFF, "Wildcard expanding \"%s\"...", gn->name); + if (ln != NULL) + suff = ln->datum; + /* + * XXX: Here we can save the suffix so we don't have to do + * this again. + */ + } + + if (suff != NULL) { + DEBUG1(SUFF, "suffix is \"%s\"...\n", suff->name); + return suff->searchPath; + } else { + DEBUG0(SUFF, "\n"); + return &dirSearchPath; /* Use default search path */ + } +} + +/* + * Apply a transformation rule, given the source and target nodes and * suffixes. * * The source and target are linked and the commands from the transformation * are added to the target node's commands list. The target also inherits all * the sources for the transformation rule. * * Results: * TRUE if successful, FALSE if not. */ static Boolean -SuffApplyTransform(GNode *tgn, GNode *sgn, Suff *tsuff, Suff *ssuff) -{ - GNodeListNode *ln; - char *tname; /* Name of transformation rule */ - GNode *gn; /* Node for same */ - - /* - * Form the proper links between the target and source. - */ - Lst_Append(tgn->children, sgn); - Lst_Append(sgn->parents, tgn); - tgn->unmade++; - - /* - * Locate the transformation rule itself - */ - tname = str_concat2(ssuff->name, tsuff->name); - gn = FindTransformByName(tname); - free(tname); - - if (gn == NULL) { +ApplyTransform(GNode *tgn, GNode *sgn, Suffix *tsuff, Suffix *ssuff) +{ + GNodeListNode *ln; + char *tname; /* Name of transformation rule */ + GNode *gn; /* Node for the transformation rule */ + + /* Form the proper links between the target and source. */ + Lst_Append(&tgn->children, sgn); + Lst_Append(&sgn->parents, tgn); + tgn->unmade++; + + /* Locate the transformation rule itself. */ + tname = str_concat2(ssuff->name, tsuff->name); + gn = FindTransformByName(tname); + free(tname); + /* This can happen when linking an OP_MEMBER and OP_ARCHV node. */ - return FALSE; - } + if (gn == NULL) + return FALSE; - DEBUG3(SUFF,"\tapplying %s -> %s to \"%s\"\n", - ssuff->name, tsuff->name, tgn->name); + DEBUG3(SUFF, "\tapplying %s -> %s to \"%s\"\n", + ssuff->name, tsuff->name, tgn->name); - /* Record last child; Make_HandleUse may add child nodes. */ - ln = tgn->children->last; + /* Record last child; Make_HandleUse may add child nodes. */ + ln = tgn->children.last; - /* Apply the rule. */ - Make_HandleUse(gn, tgn); + /* Apply the rule. */ + Make_HandleUse(gn, tgn); - /* Deal with wildcards and variables in any acquired sources. */ - ln = ln != NULL ? ln->next : NULL; - while (ln != NULL) { - GNodeListNode *nln = ln->next; - SuffExpandChildren(ln, tgn); - ln = nln; - } + /* Deal with wildcards and variables in any acquired sources. */ + ln = ln != NULL ? ln->next : NULL; + while (ln != NULL) { + GNodeListNode *nln = ln->next; + ExpandChildren(ln, tgn); + ln = nln; + } - /* - * Keep track of another parent to which this node is transformed so - * the .IMPSRC variable can be set correctly for the parent. - */ - Lst_Append(sgn->implicitParents, tgn); + /* + * Keep track of another parent to which this node is transformed so + * the .IMPSRC variable can be set correctly for the parent. + */ + Lst_Append(&sgn->implicitParents, tgn); - return TRUE; + return TRUE; } +/* + * Member has a known suffix, so look for a transformation rule from + * it to a possible suffix of the archive. + * + * Rather than searching through the entire list, we just look at + * suffixes to which the member's suffix may be transformed. + */ +static void +ExpandMember(GNode *gn, const char *eoarch, GNode *mem, Suffix *memSuff) +{ + GNodeListNode *ln; + size_t nameLen = (size_t)(eoarch - gn->name); + + /* Use first matching suffix... */ + for (ln = memSuff->parents.first; ln != NULL; ln = ln->next) + if (Suffix_IsSuffix(ln->datum, nameLen, eoarch)) + break; -/* Locate dependencies for an OP_ARCHV node. + if (ln != NULL) { + /* Got one -- apply it */ + Suffix *suff = ln->datum; + if (!ApplyTransform(gn, mem, suff, memSuff)) { + DEBUG2(SUFF, "\tNo transformation from %s -> %s\n", + memSuff->name, suff->name); + } + } +} + +static void FindDeps(GNode *, CandidateSearcher *); + +/* + * Locate dependencies for an OP_ARCHV node. * * Input: * gn Node for which to locate dependencies * * Side Effects: * Same as Suff_FindDeps */ static void -SuffFindArchiveDeps(GNode *gn, SrcList *slst) -{ - char *eoarch; /* End of archive portion */ - char *eoname; /* End of member portion */ - GNode *mem; /* Node for member */ - SuffListNode *ln, *nln; /* Next suffix node to check */ - Suff *ms; /* Suffix descriptor for member */ - char *name; /* Start of member's name */ - - /* - * The node is an archive(member) pair. so we must find a - * suffix for both of them. - */ - eoarch = strchr(gn->name, '('); - eoname = strchr(eoarch, ')'); - - /* - * Caller guarantees the format `libname(member)', via - * Arch_ParseArchive. - */ - assert(eoarch != NULL); - assert(eoname != NULL); - - *eoname = '\0'; /* Nuke parentheses during suffix search */ - *eoarch = '\0'; /* So a suffix can be found */ - - name = eoarch + 1; - - /* - * To simplify things, call Suff_FindDeps recursively on the member now, - * so we can simply compare the member's .PREFIX and .TARGET variables - * to locate its suffix. This allows us to figure out the suffix to - * use for the archive without having to do a quadratic search over the - * suffix list, backtracking for each one... - */ - mem = Targ_GetNode(name); - SuffFindDeps(mem, slst); - - /* - * Create the link between the two nodes right off - */ - Lst_Append(gn->children, mem); - Lst_Append(mem->parents, gn); - gn->unmade++; - - /* - * Copy in the variables from the member node to this one. - */ - Var_Set(PREFIX, GNode_VarPrefix(mem), gn); - Var_Set(TARGET, GNode_VarTarget(mem), gn); - - ms = mem->suffix; - if (ms == NULL) { /* Didn't know what it was. */ - SUFF_DEBUG0("using null suffix\n"); - ms = suffNull; - } - - - /* - * Set the other two local variables required for this target. - */ - Var_Set(MEMBER, name, gn); - Var_Set(ARCHIVE, gn->name, gn); - - /* - * Set $@ for compatibility with other makes - */ - Var_Set(TARGET, gn->name, gn); - - /* - * Now we've got the important local variables set, expand any sources - * that still contain variables or wildcards in their names. - */ - for (ln = gn->children->first; ln != NULL; ln = nln) { - nln = ln->next; - SuffExpandChildren(ln, gn); - } - - if (ms != NULL) { +FindDepsArchive(GNode *gn, CandidateSearcher *cs) +{ + char *eoarch; /* End of archive portion */ + char *eoname; /* End of member portion */ + GNode *mem; /* Node for member */ + Suffix *memSuff; + const char *name; /* Start of member's name */ + /* - * Member has a known suffix, so look for a transformation rule from - * it to a possible suffix of the archive. Rather than searching - * through the entire list, we just look at suffixes to which the - * member's suffix may be transformed... + * The node is an archive(member) pair. so we must find a + * suffix for both of them. */ - size_t nameLen = (size_t)(eoarch - gn->name); + eoarch = strchr(gn->name, '('); + eoname = strchr(eoarch, ')'); - /* Use first matching suffix... */ - for (ln = ms->parents->first; ln != NULL; ln = ln->next) - if (SuffSuffIsSuffix(ln->datum, nameLen, eoarch)) - break; + /* + * Caller guarantees the format `libname(member)', via + * Arch_ParseArchive. + */ + assert(eoarch != NULL); + assert(eoname != NULL); - if (ln != NULL) { - /* - * Got one -- apply it - */ - Suff *suff = ln->datum; - if (!SuffApplyTransform(gn, mem, suff, ms)) { - SUFF_DEBUG2("\tNo transformation from %s -> %s\n", - ms->name, suff->name); - } + *eoname = '\0'; /* Nuke parentheses during suffix search */ + *eoarch = '\0'; /* So a suffix can be found */ + + name = eoarch + 1; + + /* + * To simplify things, call Suff_FindDeps recursively on the member + * now, so we can simply compare the member's .PREFIX and .TARGET + * variables to locate its suffix. This allows us to figure out the + * suffix to use for the archive without having to do a quadratic + * search over the suffix list, backtracking for each one. + */ + mem = Targ_GetNode(name); + FindDeps(mem, cs); + + /* Create the link between the two nodes right off. */ + Lst_Append(&gn->children, mem); + Lst_Append(&mem->parents, gn); + gn->unmade++; + + /* Copy in the variables from the member node to this one. */ + Var_Set(PREFIX, GNode_VarPrefix(mem), gn); + Var_Set(TARGET, GNode_VarTarget(mem), gn); + + memSuff = mem->suffix; + if (memSuff == NULL) { /* Didn't know what it was. */ + DEBUG0(SUFF, "using null suffix\n"); + memSuff = nullSuff; } - } - - /* - * Replace the opening and closing parens now we've no need of the separate - * pieces. - */ - *eoarch = '('; - *eoname = ')'; - - /* - * Pretend gn appeared to the left of a dependency operator so - * the user needn't provide a transformation from the member to the - * archive. - */ - if (!GNode_IsTarget(gn)) - gn->type |= OP_DEPENDS; - - /* - * Flag the member as such so we remember to look in the archive for - * its modification time. The OP_JOIN | OP_MADE is needed because this - * target should never get made. - */ - mem->type |= OP_MEMBER | OP_JOIN | OP_MADE; -} -static void -SuffFindNormalDepsKnown(const char *name, size_t nameLen, GNode *gn, - SrcList *srcs, SrcList *targs) -{ - SuffListNode *ln; - Src *targ; - char *pref; - for (ln = sufflist->first; ln != NULL; ln = ln->next) { - Suff *suff = ln->datum; - if (!SuffSuffIsSuffix(suff, nameLen, name + nameLen)) - continue; + /* Set the other two local variables required for this target. */ + Var_Set(MEMBER, name, gn); + Var_Set(ARCHIVE, gn->name, gn); + /* Set $@ for compatibility with other makes. */ + Var_Set(TARGET, gn->name, gn); - pref = bmake_strldup(name, (size_t)(nameLen - suff->nameLen)); - targ = SrcNew(bmake_strdup(gn->name), pref, suff, NULL, gn); - suff->refCount++; + /* + * Now we've got the important local variables set, expand any sources + * that still contain variables or wildcards in their names. + */ + ExpandAllChildren(gn); + + if (memSuff != NULL) + ExpandMember(gn, eoarch, mem, memSuff); /* - * Add nodes from which the target can be made + * Replace the opening and closing parens now we've no need of the + * separate pieces. */ - SuffAddLevel(srcs, targ); + *eoarch = '('; + *eoname = ')'; /* - * Record the target so we can nuke it + * Pretend gn appeared to the left of a dependency operator so the + * user needn't provide a transformation from the member to the + * archive. */ - Lst_Append(targs, targ); - } + if (!GNode_IsTarget(gn)) + gn->type |= OP_DEPENDS; + + /* + * Flag the member as such so we remember to look in the archive for + * its modification time. The OP_JOIN | OP_MADE is needed because + * this target should never get made. + */ + mem->type |= OP_MEMBER | OP_JOIN | OP_MADE; } +/* + * If the node is a library, it is the arch module's job to find it + * and set the TARGET variable accordingly. We merely provide the + * search path, assuming all libraries end in ".a" (if the suffix + * hasn't been defined, there's nothing we can do for it, so we just + * set the TARGET variable to the node's name in order to give it a + * value). + */ static void -SuffFindNormalDepsUnknown(GNode *gn, const char *sopref, - SrcList *srcs, SrcList *targs) +FindDepsLib(GNode *gn) { - Src *targ; + Suffix *suff = FindSuffixByName(LIBSUFF); + if (suff != NULL) { + Suffix_Reassign(&gn->suffix, suff); + Arch_FindLib(gn, suff->searchPath); + } else { + Suffix_Unassign(&gn->suffix); + Var_Set(TARGET, gn->name, gn); + } - if (!Lst_IsEmpty(targs) || suffNull == NULL) - return; + /* + * Because a library (-lfoo) target doesn't follow the standard + * filesystem conventions, we don't set the regular variables for + * the thing. .PREFIX is simply made empty. + */ + Var_Set(PREFIX, "", gn); +} - SUFF_DEBUG1("\tNo known suffix on %s. Using .NULL suffix\n", gn->name); +static void +FindDepsRegularKnown(const char *name, size_t nameLen, GNode *gn, + CandidateList *srcs, CandidateList *targs) +{ + SuffixListNode *ln; + Candidate *targ; + char *pref; - targ = SrcNew(bmake_strdup(gn->name), bmake_strdup(sopref), - suffNull, NULL, gn); - targ->suff->refCount++; + for (ln = sufflist.first; ln != NULL; ln = ln->next) { + Suffix *suff = ln->datum; + if (!Suffix_IsSuffix(suff, nameLen, name + nameLen)) + continue; - /* - * Only use the default suffix rules if we don't have commands - * defined for this gnode; traditional make programs used to - * not define suffix rules if the gnode had children but we - * don't do this anymore. - */ - if (Lst_IsEmpty(gn->commands)) - SuffAddLevel(srcs, targ); - else { - SUFF_DEBUG0("not "); - } + pref = bmake_strldup(name, (size_t)(nameLen - suff->nameLen)); + targ = Candidate_New(bmake_strdup(gn->name), pref, suff, NULL, + gn); - SUFF_DEBUG0("adding suffix rules\n"); + CandidateList_AddCandidatesFor(srcs, targ); - Lst_Append(targs, targ); + /* Record the target so we can nuke it. */ + Lst_Append(targs, targ); + } } -/* - * Deal with finding the thing on the default search path. We - * always do that, not only if the node is only a source (not - * on the lhs of a dependency operator or [XXX] it has neither - * children or commands) as the old pmake did. - */ static void -SuffFindNormalDepsPath(GNode *gn, Src *targ) +FindDepsRegularUnknown(GNode *gn, const char *sopref, + CandidateList *srcs, CandidateList *targs) { - if (gn->type & (OP_PHONY | OP_NOPATH)) - return; + Candidate *targ; + + if (!Lst_IsEmpty(targs) || nullSuff == NULL) + return; - free(gn->path); - gn->path = Dir_FindFile(gn->name, - (targ == NULL ? dirSearchPath : - targ->suff->searchPath)); - if (gn->path == NULL) - return; + DEBUG1(SUFF, "\tNo known suffix on %s. Using .NULL suffix\n", gn->name); - Var_Set(TARGET, gn->path, gn); + targ = Candidate_New(bmake_strdup(gn->name), bmake_strdup(sopref), + nullSuff, NULL, gn); - if (targ != NULL) { /* - * Suffix known for the thing -- trim the suffix off - * the path to form the proper .PREFIX variable. + * Only use the default suffix rules if we don't have commands + * defined for this gnode; traditional make programs used to not + * define suffix rules if the gnode had children but we don't do + * this anymore. */ - size_t savep = strlen(gn->path) - targ->suff->nameLen; - char savec; - char *ptr; + if (Lst_IsEmpty(&gn->commands)) + CandidateList_AddCandidatesFor(srcs, targ); + else { + DEBUG0(SUFF, "not "); + } - if (gn->suffix) - gn->suffix->refCount--; - gn->suffix = targ->suff; - gn->suffix->refCount++; + DEBUG0(SUFF, "adding suffix rules\n"); - savec = gn->path[savep]; - gn->path[savep] = '\0'; + Lst_Append(targs, targ); +} - if ((ptr = strrchr(gn->path, '/')) != NULL) - ptr++; - else - ptr = gn->path; +/* + * Deal with finding the thing on the default search path. We always do + * that, not only if the node is only a source (not on the lhs of a + * dependency operator or [XXX] it has neither children or commands) as + * the old pmake did. + */ +static void +FindDepsRegularPath(GNode *gn, Candidate *targ) +{ + if (gn->type & (OP_PHONY | OP_NOPATH)) + return; - Var_Set(PREFIX, ptr, gn); + free(gn->path); + gn->path = Dir_FindFile(gn->name, + (targ == NULL ? &dirSearchPath : + targ->suff->searchPath)); + if (gn->path == NULL) + return; - gn->path[savep] = savec; - } else { - char *ptr; + Var_Set(TARGET, gn->path, gn); - /* The .PREFIX gets the full path if the target has no known suffix. */ - if (gn->suffix) - gn->suffix->refCount--; - gn->suffix = NULL; + if (targ != NULL) { + /* + * Suffix known for the thing -- trim the suffix off + * the path to form the proper .PREFIX variable. + */ + size_t savep = strlen(gn->path) - targ->suff->nameLen; + char savec; - if ((ptr = strrchr(gn->path, '/')) != NULL) - ptr++; - else - ptr = gn->path; + Suffix_Reassign(&gn->suffix, targ->suff); + + savec = gn->path[savep]; + gn->path[savep] = '\0'; - Var_Set(PREFIX, ptr, gn); - } + Var_Set(PREFIX, str_basename(gn->path), gn); + + gn->path[savep] = savec; + } else { + /* + * The .PREFIX gets the full path if the target has no + * known suffix. + */ + Suffix_Unassign(&gn->suffix); + Var_Set(PREFIX, str_basename(gn->path), gn); + } } -/* Locate implicit dependencies for regular targets. +/* + * Locate implicit dependencies for regular targets. * * Input: * gn Node for which to find sources * * Side Effects: * Same as Suff_FindDeps */ static void -SuffFindNormalDeps(GNode *gn, SrcList *slst) -{ - SrcList *srcs; /* List of sources at which to look */ - SrcList *targs; /* List of targets to which things can be - * transformed. They all have the same file, - * but different suff and pref fields */ - Src *bottom; /* Start of found transformation path */ - Src *src; /* General Src pointer */ - char *pref; /* Prefix to use */ - Src *targ; /* General Src target pointer */ - - const char *name = gn->name; - size_t nameLen = strlen(name); - - /* - * Begin at the beginning... - */ - srcs = Lst_New(); - targs = Lst_New(); - - /* - * We're caught in a catch-22 here. On the one hand, we want to use any - * transformation implied by the target's sources, but we can't examine - * the sources until we've expanded any variables/wildcards they may hold, - * and we can't do that until we've set up the target's local variables - * and we can't do that until we know what the proper suffix for the - * target is (in case there are two suffixes one of which is a suffix of - * the other) and we can't know that until we've found its implied - * source, which we may not want to use if there's an existing source - * that implies a different transformation. - * - * In an attempt to get around this, which may not work all the time, - * but should work most of the time, we look for implied sources first, - * checking transformations to all possible suffixes of the target, - * use what we find to set the target's local variables, expand the - * children, then look for any overriding transformations they imply. - * Should we find one, we discard the one we found before. - */ - bottom = NULL; - targ = NULL; - - if (!(gn->type & OP_PHONY)) { - - SuffFindNormalDepsKnown(name, nameLen, gn, srcs, targs); - - /* Handle target of unknown suffix... */ - SuffFindNormalDepsUnknown(gn, name, srcs, targs); +FindDepsRegular(GNode *gn, CandidateSearcher *cs) +{ + /* List of sources at which to look */ + CandidateList srcs = LST_INIT; + /* + * List of targets to which things can be transformed. + * They all have the same file, but different suff and prefix fields. + */ + CandidateList targs = LST_INIT; + Candidate *bottom; /* Start of found transformation path */ + Candidate *src; + Candidate *targ; + + const char *name = gn->name; + size_t nameLen = strlen(name); + +#ifdef DEBUG_SRC + DEBUG1(SUFF, "FindDepsRegular \"%s\"\n", gn->name); +#endif /* - * Using the list of possible sources built up from the target - * suffix(es), try and find an existing file/target that matches. + * We're caught in a catch-22 here. On the one hand, we want to use + * any transformation implied by the target's sources, but we can't + * examine the sources until we've expanded any variables/wildcards + * they may hold, and we can't do that until we've set up the + * target's local variables and we can't do that until we know what + * the proper suffix for the target is (in case there are two + * suffixes one of which is a suffix of the other) and we can't know + * that until we've found its implied source, which we may not want + * to use if there's an existing source that implies a different + * transformation. + * + * In an attempt to get around this, which may not work all the time, + * but should work most of the time, we look for implied sources + * first, checking transformations to all possible suffixes of the + * target, use what we find to set the target's local variables, + * expand the children, then look for any overriding transformations + * they imply. Should we find one, we discard the one we found before. */ - bottom = SuffFindThem(srcs, slst); + bottom = NULL; + targ = NULL; - if (bottom == NULL) { - /* - * No known transformations -- use the first suffix found - * for setting the local variables. - */ - if (targs->first != NULL) - targ = targs->first->datum; - else - targ = NULL; - } else { - /* - * Work up the transformation path to find the suffix of the - * target to which the transformation was made. - */ - for (targ = bottom; targ->parent != NULL; targ = targ->parent) - continue; + if (!(gn->type & OP_PHONY)) { + + FindDepsRegularKnown(name, nameLen, gn, &srcs, &targs); + + /* Handle target of unknown suffix... */ + FindDepsRegularUnknown(gn, name, &srcs, &targs); + + /* + * Using the list of possible sources built up from the target + * suffix(es), try and find an existing file/target that + * matches. + */ + bottom = FindThem(&srcs, cs); + + if (bottom == NULL) { + /* + * No known transformations -- use the first suffix + * found for setting the local variables. + */ + if (targs.first != NULL) + targ = targs.first->datum; + else + targ = NULL; + } else { + /* + * Work up the transformation path to find the suffix + * of the target to which the transformation was made. + */ + for (targ = bottom; + targ->parent != NULL; targ = targ->parent) + continue; + } } - } - - Var_Set(TARGET, GNode_Path(gn), gn); - - pref = targ != NULL ? targ->pref : gn->name; - Var_Set(PREFIX, pref, gn); - - /* - * Now we've got the important local variables set, expand any sources - * that still contain variables or wildcards in their names. - */ - { - SuffListNode *ln, *nln; - for (ln = gn->children->first; ln != NULL; ln = nln) { - nln = ln->next; - SuffExpandChildren(ln, gn); + + Var_Set(TARGET, GNode_Path(gn), gn); + Var_Set(PREFIX, targ != NULL ? targ->prefix : gn->name, gn); + + /* + * Now we've got the important local variables set, expand any sources + * that still contain variables or wildcards in their names. + */ + { + GNodeListNode *ln, *nln; + for (ln = gn->children.first; ln != NULL; ln = nln) { + nln = ln->next; + ExpandChildren(ln, gn); + } + } + + if (targ == NULL) { + DEBUG1(SUFF, "\tNo valid suffix on %s\n", gn->name); + + sfnd_abort: + FindDepsRegularPath(gn, targ); + goto sfnd_return; + } + + /* + * If the suffix indicates that the target is a library, mark that in + * the node's type field. + */ + if (targ->suff->flags & SUFF_LIBRARY) + gn->type |= OP_LIB; + + /* + * Check for overriding transformation rule implied by sources + */ + if (!Lst_IsEmpty(&gn->children)) { + src = FindCmds(targ, cs); + + if (src != NULL) { + /* + * Free up all the candidates in the transformation + * path, up to but not including the parent node. + */ + while (bottom != NULL && bottom->parent != NULL) { + CandidateSearcher_AddIfNew(cs, bottom); + bottom = bottom->parent; + } + bottom = src; + } } - } - - if (targ == NULL) { - SUFF_DEBUG1("\tNo valid suffix on %s\n", gn->name); - -sfnd_abort: - SuffFindNormalDepsPath(gn, targ); - goto sfnd_return; - } - - /* - * If the suffix indicates that the target is a library, mark that in - * the node's type field. - */ - if (targ->suff->flags & SUFF_LIBRARY) - gn->type |= OP_LIB; - - /* - * Check for overriding transformation rule implied by sources - */ - if (!Lst_IsEmpty(gn->children)) { - src = SuffFindCmds(targ, slst); - - if (src != NULL) { - /* - * Free up all the Src structures in the transformation path - * up to, but not including, the parent node. - */ - while (bottom != NULL && bottom->parent != NULL) { - if (Lst_FindDatum(slst, bottom) == NULL) - Lst_Append(slst, bottom); - bottom = bottom->parent; - } - bottom = src; + + if (bottom == NULL) { + /* No idea from where it can come -- return now. */ + goto sfnd_abort; } - } - if (bottom == NULL) { /* - * No idea from where it can come -- return now. + * We now have a list of candidates headed by 'bottom' and linked via + * their 'parent' pointers. What we do next is create links between + * source and target nodes (which may or may not have been created) + * and set the necessary local variables in each target. + * + * The commands for each target are set from the commands of the + * transformation rule used to get from the src suffix to the targ + * suffix. Note that this causes the commands list of the original + * node, gn, to be replaced with the commands of the final + * transformation rule. */ - goto sfnd_abort; - } - - /* - * We now have a list of Src structures headed by 'bottom' and linked via - * their 'parent' pointers. What we do next is create links between - * source and target nodes (which may or may not have been created) - * and set the necessary local variables in each target. The - * commands for each target are set from the commands of the - * transformation rule used to get from the src suffix to the targ - * suffix. Note that this causes the commands list of the original - * node, gn, to be replaced by the commands of the final - * transformation rule. Also, the unmade field of gn is incremented. - * Etc. - */ - if (bottom->node == NULL) - bottom->node = Targ_GetNode(bottom->file); - - for (src = bottom; src->parent != NULL; src = src->parent) { - targ = src->parent; - - if (src->node->suffix) - src->node->suffix->refCount--; - src->node->suffix = src->suff; - src->node->suffix->refCount++; - - if (targ->node == NULL) - targ->node = Targ_GetNode(targ->file); - - SuffApplyTransform(targ->node, src->node, - targ->suff, src->suff); - - if (targ->node != gn) { - /* - * Finish off the dependency-search process for any nodes - * between bottom and gn (no point in questing around the - * filesystem for their implicit source when it's already - * known). Note that the node can't have any sources that - * need expanding, since SuffFindThem will stop on an existing - * node, so all we need to do is set the standard variables. - */ - targ->node->type |= OP_DEPS_FOUND; - Var_Set(PREFIX, targ->pref, targ->node); - Var_Set(TARGET, targ->node->name, targ->node); + if (bottom->node == NULL) + bottom->node = Targ_GetNode(bottom->file); + + for (src = bottom; src->parent != NULL; src = src->parent) { + targ = src->parent; + + Suffix_Reassign(&src->node->suffix, src->suff); + + if (targ->node == NULL) + targ->node = Targ_GetNode(targ->file); + + ApplyTransform(targ->node, src->node, + targ->suff, src->suff); + + if (targ->node != gn) { + /* + * Finish off the dependency-search process for any + * nodes between bottom and gn (no point in questing + * around the filesystem for their implicit source + * when it's already known). Note that the node + * can't have any sources that need expanding, since + * SuffFindThem will stop on an existing node, so all + * we need to do is set the standard variables. + */ + targ->node->type |= OP_DEPS_FOUND; + Var_Set(PREFIX, targ->prefix, targ->node); + Var_Set(TARGET, targ->node->name, targ->node); + } } - } - if (gn->suffix != NULL) - gn->suffix->refCount--; - gn->suffix = src->suff; - gn->suffix->refCount++; + Suffix_Reassign(&gn->suffix, src->suff); - /* - * Nuke the transformation path and the Src structures left over in the - * two lists. - */ + /* + * Nuke the transformation path and the candidates left over in the + * two lists. + */ sfnd_return: - if (bottom != NULL && Lst_FindDatum(slst, bottom) == NULL) - Lst_Append(slst, bottom); + if (bottom != NULL) + CandidateSearcher_AddIfNew(cs, bottom); - while (SuffRemoveSrc(srcs) || SuffRemoveSrc(targs)) - continue; + while (RemoveCandidate(&srcs) || RemoveCandidate(&targs)) + continue; - Lst_MoveAll(slst, srcs); - Lst_MoveAll(slst, targs); + CandidateSearcher_MoveAll(cs, &srcs); + CandidateSearcher_MoveAll(cs, &targs); } +static void +CandidateSearcher_CleanUp(CandidateSearcher *cs) +{ + while (RemoveCandidate(&cs->list)) + continue; + assert(Lst_IsEmpty(&cs->list)); +} -/* Find implicit sources for the target. + +/* + * Find implicit sources for the target. * - * Nodes are added to the graph below the passed-in node. The nodes are - * marked to have their IMPSRC variable filled in. The PREFIX variable is set - * for the given node and all its implied children. + * Nodes are added to the graph as children of the passed-in node. The nodes + * are marked to have their IMPSRC variable filled in. The PREFIX variable + * is set for the given node and all its implied children. * * The path found by this target is the shortest path in the transformation - * graph, which may pass through non-existent targets, to an existing target. + * graph, which may pass through nonexistent targets, to an existing target. * The search continues on all paths from the root suffix until a file is * found. I.e. if there's a path .o -> .c -> .l -> .l,v from the root and the * .l,v file exists but the .c and .l files don't, the search will branch out * in all directions from .o and again from all the nodes on the next level * until the .l,v node is encountered. */ void Suff_FindDeps(GNode *gn) { + CandidateSearcher cs; + + CandidateSearcher_Init(&cs); + + FindDeps(gn, &cs); - SuffFindDeps(gn, srclist); - while (SuffRemoveSrc(srclist)) - continue; + CandidateSearcher_CleanUp(&cs); + CandidateSearcher_Done(&cs); } static void -SuffFindDeps(GNode *gn, SrcList *slst) +FindDeps(GNode *gn, CandidateSearcher *cs) { - if (gn->type & OP_DEPS_FOUND) - return; - gn->type |= OP_DEPS_FOUND; + if (gn->type & OP_DEPS_FOUND) + return; + gn->type |= OP_DEPS_FOUND; - /* - * Make sure we have these set, may get revised below. - */ - Var_Set(TARGET, GNode_Path(gn), gn); - Var_Set(PREFIX, gn->name, gn); + /* Make sure we have these set, may get revised below. */ + Var_Set(TARGET, GNode_Path(gn), gn); + Var_Set(PREFIX, gn->name, gn); - SUFF_DEBUG1("SuffFindDeps (%s)\n", gn->name); + DEBUG1(SUFF, "SuffFindDeps \"%s\"\n", gn->name); - if (gn->type & OP_ARCHV) { - SuffFindArchiveDeps(gn, slst); - } else if (gn->type & OP_LIB) { - /* - * If the node is a library, it is the arch module's job to find it - * and set the TARGET variable accordingly. We merely provide the - * search path, assuming all libraries end in ".a" (if the suffix - * hasn't been defined, there's nothing we can do for it, so we just - * set the TARGET variable to the node's name in order to give it a - * value). - */ - Suff *s = FindSuffByName(LIBSUFF); - if (gn->suffix) - gn->suffix->refCount--; - if (s != NULL) { - gn->suffix = s; - gn->suffix->refCount++; - Arch_FindLib(gn, s->searchPath); - } else { - gn->suffix = NULL; - Var_Set(TARGET, gn->name, gn); - } - /* - * Because a library (-lfoo) target doesn't follow the standard - * filesystem conventions, we don't set the regular variables for - * the thing. .PREFIX is simply made empty... - */ - Var_Set(PREFIX, "", gn); - } else { - SuffFindNormalDeps(gn, slst); - } + if (gn->type & OP_ARCHV) + FindDepsArchive(gn, cs); + else if (gn->type & OP_LIB) + FindDepsLib(gn); + else + FindDepsRegular(gn, cs); } -/* Define which suffix is the null suffix. +/* + * Define which suffix is the null suffix. * * Need to handle the changing of the null suffix gracefully so the old * transformation rules don't just go away. * * Input: * name Name of null suffix */ void Suff_SetNull(const char *name) { - Suff *suff = FindSuffByName(name); - if (suff == NULL) { - Parse_Error(PARSE_WARNING, "Desired null suffix %s not defined.", + Suffix *suff = FindSuffixByName(name); + if (suff == NULL) { + Parse_Error(PARSE_WARNING, + "Desired null suffix %s not defined.", name); - return; - } + return; + } - if (suffNull != NULL) - suffNull->flags &= ~(unsigned)SUFF_NULL; - suff->flags |= SUFF_NULL; - /* - * XXX: Here's where the transformation mangling would take place - */ - suffNull = suff; + if (nullSuff != NULL) + nullSuff->flags &= ~(unsigned)SUFF_NULL; + suff->flags |= SUFF_NULL; + /* XXX: Here's where the transformation mangling would take place. */ + nullSuff = suff; } /* Initialize the suffixes module. */ void Suff_Init(void) { -#ifdef CLEANUP - suffClean = Lst_New(); - sufflist = Lst_New(); -#endif - srclist = Lst_New(); - transforms = Lst_New(); - - /* - * Create null suffix for single-suffix rules (POSIX). The thing doesn't - * actually go on the suffix list or everyone will think that's its - * suffix. - */ - Suff_ClearSuffixes(); + /* + * Create null suffix for single-suffix rules (POSIX). The thing + * doesn't actually go on the suffix list or everyone will think + * that's its suffix. + */ + Suff_ClearSuffixes(); } /* Clean up the suffixes module. */ void Suff_End(void) { #ifdef CLEANUP - Lst_Destroy(sufflist, SuffFree); - Lst_Destroy(suffClean, SuffFree); - if (suffNull) - SuffFree(suffNull); - Lst_Free(srclist); - Lst_Free(transforms); + Lst_DoneCall(&sufflist, SuffFree); + Lst_DoneCall(&suffClean, SuffFree); + if (nullSuff != NULL) + SuffFree(nullSuff); + Lst_Done(&transforms); #endif } static void -PrintSuffNames(const char *prefix, SuffList *suffs) +PrintSuffNames(const char *prefix, SuffixList *suffs) { - SuffListNode *ln; + SuffixListNode *ln; - debug_printf("#\t%s: ", prefix); - for (ln = suffs->first; ln != NULL; ln = ln->next) { - Suff *suff = ln->datum; - debug_printf("%s ", suff->name); - } - debug_printf("\n"); + debug_printf("#\t%s: ", prefix); + for (ln = suffs->first; ln != NULL; ln = ln->next) { + Suffix *suff = ln->datum; + debug_printf("%s ", suff->name); + } + debug_printf("\n"); } static void -PrintSuff(Suff *suff) +Suffix_Print(Suffix *suff) { - debug_printf("# \"%s\" (num %d, ref %d)", - suff->name, suff->sNum, suff->refCount); - if (suff->flags != 0) { - char flags_buf[SuffFlags_ToStringSize]; - - debug_printf(" (%s)", - Enum_FlagsToString(flags_buf, sizeof flags_buf, - suff->flags, SuffFlags_ToStringSpecs)); - } - debug_printf("\n"); + debug_printf("# \"%s\" (num %d, ref %d)", + suff->name, suff->sNum, suff->refCount); + if (suff->flags != 0) { + char flags_buf[SuffixFlags_ToStringSize]; + + debug_printf(" (%s)", + Enum_FlagsToString(flags_buf, sizeof flags_buf, + suff->flags, + SuffixFlags_ToStringSpecs)); + } + debug_printf("\n"); - PrintSuffNames("To", suff->parents); - PrintSuffNames("From", suff->children); + PrintSuffNames("To", &suff->parents); + PrintSuffNames("From", &suff->children); - debug_printf("#\tSearch Path: "); - Dir_PrintPath(suff->searchPath); - debug_printf("\n"); + debug_printf("#\tSearch Path: "); + SearchPath_Print(suff->searchPath); + debug_printf("\n"); } static void PrintTransformation(GNode *t) { - debug_printf("%-16s:", t->name); - Targ_PrintType(t->type); - debug_printf("\n"); - Targ_PrintCmds(t); - debug_printf("\n"); + debug_printf("%-16s:", t->name); + Targ_PrintType(t->type); + debug_printf("\n"); + Targ_PrintCmds(t); + debug_printf("\n"); } void Suff_PrintAll(void) { - debug_printf("#*** Suffixes:\n"); - { - SuffListNode *ln; - for (ln = sufflist->first; ln != NULL; ln = ln->next) - PrintSuff(ln->datum); - } + debug_printf("#*** Suffixes:\n"); + { + SuffixListNode *ln; + for (ln = sufflist.first; ln != NULL; ln = ln->next) + Suffix_Print(ln->datum); + } - debug_printf("#*** Transformations:\n"); - { - GNodeListNode *ln; - for (ln = transforms->first; ln != NULL; ln = ln->next) - PrintTransformation(ln->datum); - } + debug_printf("#*** Transformations:\n"); + { + GNodeListNode *ln; + for (ln = transforms.first; ln != NULL; ln = ln->next) + PrintTransformation(ln->datum); + } } diff --git a/targ.c b/targ.c index 43489c9d922b..a5194f95381f 100644 --- a/targ.c +++ b/targ.c @@ -1,599 +1,617 @@ -/* $NetBSD: targ.c,v 1.135 2020/11/16 22:28:44 rillig Exp $ */ +/* $NetBSD: targ.c,v 1.160 2021/01/10 23:59:53 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Maintaining the targets and sources, which are both implemented as GNode. * * Interface: * Targ_Init Initialize the module. * * Targ_End Clean up the module. * * Targ_List Return the list of all targets so far. * * GNode_New Create a new GNode for the passed target * (string). The node is *not* placed in the * hash table, though all its fields are * initialized. * * Targ_FindNode Find the node, or return NULL. * * Targ_GetNode Find the node, or create it. * * Targ_NewInternalNode * Create an internal node. * * Targ_FindList Given a list of names, find nodes for all * of them, creating them as necessary. * - * Targ_Ignore Return TRUE if errors should be ignored when - * creating the given target. - * - * Targ_Silent Return TRUE if we should be silent when - * creating the given target. - * * Targ_Precious Return TRUE if the target is precious and * should not be removed if we are interrupted. * * Targ_Propagate Propagate information between related nodes. * Should be called after the makefiles are parsed * but before any action is taken. * * Debugging: * Targ_PrintGraph - * Print out the entire graphm all variables and + * Print out the entire graph, all variables and * statistics for the directory cache. Should print * something for suffixes, too, but... */ #include #include "make.h" #include "dir.h" /* "@(#)targ.c 8.2 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: targ.c,v 1.135 2020/11/16 22:28:44 rillig Exp $"); +MAKE_RCSID("$NetBSD: targ.c,v 1.160 2021/01/10 23:59:53 rillig Exp $"); -/* All target nodes found so far, but not the source nodes. */ -static GNodeList *allTargets; +/* + * All target nodes that appeared on the left-hand side of one of the + * dependency operators ':', '::', '!'. + */ +static GNodeList allTargets = LST_INIT; static HashTable allTargetsByName; #ifdef CLEANUP -static GNodeList *allNodes; +static GNodeList allNodes = LST_INIT; static void GNode_Free(void *); #endif void Targ_Init(void) { - allTargets = Lst_New(); - HashTable_Init(&allTargetsByName); -#ifdef CLEANUP - allNodes = Lst_New(); -#endif + HashTable_Init(&allTargetsByName); } void Targ_End(void) { - Targ_Stats(); + Targ_Stats(); #ifdef CLEANUP - Lst_Free(allTargets); - HashTable_Done(&allTargetsByName); - Lst_Destroy(allNodes, GNode_Free); + Lst_Done(&allTargets); + HashTable_Done(&allTargetsByName); + Lst_DoneCall(&allNodes, GNode_Free); #endif } void Targ_Stats(void) { - HashTable_DebugStats(&allTargetsByName, "targets"); + HashTable_DebugStats(&allTargetsByName, "targets"); } /* * Return the list of all targets, which are all nodes that appear on the * left-hand side of a dependency declaration such as "target: source". * The returned list does not contain pure sources. */ GNodeList * Targ_List(void) { - return allTargets; + return &allTargets; } -/* Create a new graph node, but don't register it anywhere. +/* + * Create a new graph node, but don't register it anywhere. * * Graph nodes that appear on the left-hand side of a dependency line such * as "target: source" are called targets. XXX: In some cases (like the * .ALLTARGETS variable), all nodes are called targets as well, even if they * never appear on the left-hand side. This is a mistake. * * Typical names for graph nodes are: * "src.c" (an ordinary file) * "clean" (a .PHONY target) * ".END" (a special hook target) * "-lm" (a library) * "libc.a(isspace.o)" (an archive member) */ GNode * GNode_New(const char *name) { - GNode *gn; - - gn = bmake_malloc(sizeof *gn); - gn->name = bmake_strdup(name); - gn->uname = NULL; - gn->path = NULL; - gn->type = name[0] == '-' && name[1] == 'l' ? OP_LIB : 0; - gn->flags = 0; - gn->made = UNMADE; - gn->unmade = 0; - gn->mtime = 0; - gn->youngestChild = NULL; - gn->implicitParents = Lst_New(); - gn->parents = Lst_New(); - gn->children = Lst_New(); - gn->order_pred = Lst_New(); - gn->order_succ = Lst_New(); - gn->cohorts = Lst_New(); - gn->cohort_num[0] = '\0'; - gn->unmade_cohorts = 0; - gn->centurion = NULL; - gn->checked_seqno = 0; - HashTable_Init(&gn->context); - gn->commands = Lst_New(); - gn->suffix = NULL; - gn->fname = NULL; - gn->lineno = 0; + GNode *gn; + + gn = bmake_malloc(sizeof *gn); + gn->name = bmake_strdup(name); + gn->uname = NULL; + gn->path = NULL; + gn->type = name[0] == '-' && name[1] == 'l' ? OP_LIB : OP_NONE; + gn->flags = GNF_NONE; + gn->made = UNMADE; + gn->unmade = 0; + gn->mtime = 0; + gn->youngestChild = NULL; + Lst_Init(&gn->implicitParents); + Lst_Init(&gn->parents); + Lst_Init(&gn->children); + Lst_Init(&gn->order_pred); + Lst_Init(&gn->order_succ); + Lst_Init(&gn->cohorts); + gn->cohort_num[0] = '\0'; + gn->unmade_cohorts = 0; + gn->centurion = NULL; + gn->checked_seqno = 0; + HashTable_Init(&gn->vars); + Lst_Init(&gn->commands); + gn->suffix = NULL; + gn->fname = NULL; + gn->lineno = 0; #ifdef CLEANUP - Lst_Append(allNodes, gn); + Lst_Append(&allNodes, gn); #endif - return gn; + return gn; } #ifdef CLEANUP static void GNode_Free(void *gnp) { - GNode *gn = gnp; - - free(gn->name); - free(gn->uname); - free(gn->path); - /* gn->youngestChild is not owned by this node. */ - Lst_Free(gn->implicitParents); /* ... but not the nodes themselves, */ - Lst_Free(gn->parents); /* as they are not owned by this node. */ - Lst_Free(gn->children); /* likewise */ - Lst_Free(gn->order_pred); /* likewise */ - Lst_Free(gn->order_succ); /* likewise */ - Lst_Free(gn->cohorts); /* likewise */ - HashTable_Done(&gn->context); /* ... but not the variables themselves, - * even though they are owned by this node. - * XXX: they should probably be freed. */ - Lst_Free(gn->commands); /* ... but not the commands themselves, - * as they may be shared with other nodes. */ - /* gn->suffix is not owned by this node. */ - /* XXX: gn->suffix should be unreferenced here. This requires a thorough - * check that the reference counting is done correctly in all places, - * otherwise a suffix might be freed too early. */ - - free(gn); + GNode *gn = gnp; + + free(gn->name); + free(gn->uname); + free(gn->path); + + /* Don't free gn->youngestChild since it is not owned by this node. */ + + /* + * In the following lists, only free the list nodes, but not the + * GNodes in them since these are not owned by this node. + */ + Lst_Done(&gn->implicitParents); + Lst_Done(&gn->parents); + Lst_Done(&gn->children); + Lst_Done(&gn->order_pred); + Lst_Done(&gn->order_succ); + Lst_Done(&gn->cohorts); + + /* + * Do not free the variables themselves, even though they are owned + * by this node. + * + * XXX: For the nodes that represent targets or sources (and not + * VAR_GLOBAL), it should be safe to free the variables as well, + * since each node manages the memory for all its variables itself. + * + * XXX: The GNodes that are only used as variable contexts (VAR_CMD, + * VAR_GLOBAL, VAR_INTERNAL) are not freed at all (see Var_End, where + * they are not mentioned). These might be freed at all, if their + * variable values are indeed not used anywhere else (see Trace_Init + * for the only suspicious use). + */ + HashTable_Done(&gn->vars); + + /* + * Do not free the commands themselves, as they may be shared with + * other nodes. + */ + Lst_Done(&gn->commands); + + /* + * gn->suffix is not owned by this node. + * + * XXX: gn->suffix should be unreferenced here. This requires a + * thorough check that the reference counting is done correctly in + * all places, otherwise a suffix might be freed too early. + */ + + free(gn); } #endif /* Get the existing global node, or return NULL. */ GNode * Targ_FindNode(const char *name) { - return HashTable_FindValue(&allTargetsByName, name); + return HashTable_FindValue(&allTargetsByName, name); } /* Get the existing global node, or create it. */ GNode * Targ_GetNode(const char *name) { - Boolean isNew; - HashEntry *he = HashTable_CreateEntry(&allTargetsByName, name, &isNew); - if (!isNew) - return HashEntry_Get(he); - - { - GNode *gn = Targ_NewInternalNode(name); - HashEntry_Set(he, gn); - return gn; - } + Boolean isNew; + HashEntry *he = HashTable_CreateEntry(&allTargetsByName, name, &isNew); + if (!isNew) + return HashEntry_Get(he); + + { + GNode *gn = Targ_NewInternalNode(name); + HashEntry_Set(he, gn); + return gn; + } } /* * Create a node, register it in .ALLTARGETS but don't store it in the * table of global nodes. This means it cannot be found by name. * * This is used for internal nodes, such as cohorts or .WAIT nodes. */ GNode * Targ_NewInternalNode(const char *name) { - GNode *gn = GNode_New(name); - Var_Append(".ALLTARGETS", name, VAR_GLOBAL); - Lst_Append(allTargets, gn); - if (doing_depend) - gn->flags |= FROM_DEPEND; - return gn; + GNode *gn = GNode_New(name); + Var_Append(".ALLTARGETS", name, VAR_GLOBAL); + Lst_Append(&allTargets, gn); + DEBUG1(TARG, "Adding \"%s\" to all targets.\n", gn->name); + if (doing_depend) + gn->flags |= FROM_DEPEND; + return gn; } /* * Return the .END node, which contains the commands to be run when * everything else has been made. */ -GNode *Targ_GetEndNode(void) -{ - /* Save the node locally to avoid having to search for it all the time. */ - static GNode *endNode = NULL; - if (endNode == NULL) { - endNode = Targ_GetNode(".END"); - endNode->type = OP_SPECIAL; - } - return endNode; -} - -/* Return the named nodes, creating them as necessary. */ -GNodeList * -Targ_FindList(StringList *names) +GNode * +Targ_GetEndNode(void) { - StringListNode *ln; - GNodeList *nodes = Lst_New(); - for (ln = names->first; ln != NULL; ln = ln->next) { - const char *name = ln->datum; - GNode *gn = Targ_GetNode(name); - Lst_Append(nodes, gn); - } - return nodes; + /* + * Save the node locally to avoid having to search for it all + * the time. + */ + static GNode *endNode = NULL; + + if (endNode == NULL) { + endNode = Targ_GetNode(".END"); + endNode->type = OP_SPECIAL; + } + return endNode; } -/* Return true if should ignore errors when creating gn. */ -Boolean -Targ_Ignore(const GNode *gn) +/* Add the named nodes to the list, creating them as necessary. */ +void +Targ_FindList(GNodeList *gns, StringList *names) { - return opts.ignoreErrors || gn->type & OP_IGNORE; -} + StringListNode *ln; -/* Return true if be silent when creating gn. */ -Boolean -Targ_Silent(const GNode *gn) -{ - return opts.beSilent || gn->type & OP_SILENT; + for (ln = names->first; ln != NULL; ln = ln->next) { + const char *name = ln->datum; + GNode *gn = Targ_GetNode(name); + Lst_Append(gns, gn); + } } /* See if the given target is precious. */ Boolean Targ_Precious(const GNode *gn) { - /* XXX: Why are '::' targets precious? */ - return allPrecious || gn->type & (OP_PRECIOUS | OP_DOUBLEDEP); + /* XXX: Why are '::' targets precious? */ + return allPrecious || gn->type & (OP_PRECIOUS | OP_DOUBLEDEP); } /* * The main target to be made; only for debugging output. * See mainNode in parse.c for the definitive source. */ static GNode *mainTarg; /* Remember the main target to make; only used for debugging. */ void Targ_SetMain(GNode *gn) { - mainTarg = gn; + mainTarg = gn; } static void PrintNodeNames(GNodeList *gnodes) { - GNodeListNode *node; + GNodeListNode *ln; - for (node = gnodes->first; node != NULL; node = node->next) { - GNode *gn = node->datum; - debug_printf(" %s%s", gn->name, gn->cohort_num); - } + for (ln = gnodes->first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; + debug_printf(" %s%s", gn->name, gn->cohort_num); + } } static void PrintNodeNamesLine(const char *label, GNodeList *gnodes) { - if (Lst_IsEmpty(gnodes)) - return; - debug_printf("# %s:", label); - PrintNodeNames(gnodes); - debug_printf("\n"); + if (Lst_IsEmpty(gnodes)) + return; + debug_printf("# %s:", label); + PrintNodeNames(gnodes); + debug_printf("\n"); } void Targ_PrintCmds(GNode *gn) { - StringListNode *ln; - for (ln = gn->commands->first; ln != NULL; ln = ln->next) { - const char *cmd = ln->datum; - debug_printf("\t%s\n", cmd); - } + StringListNode *ln; + + for (ln = gn->commands.first; ln != NULL; ln = ln->next) { + const char *cmd = ln->datum; + debug_printf("\t%s\n", cmd); + } } -/* Format a modification time in some reasonable way and return it. - * The time is placed in a static area, so it is overwritten with each call. */ -char * +/* + * Format a modification time in some reasonable way and return it. + * The formatted time is placed in a static area, so it is overwritten + * with each call. + */ +const char * Targ_FmtTime(time_t tm) { - struct tm *parts; - static char buf[128]; + static char buf[128]; - parts = localtime(&tm); - (void)strftime(buf, sizeof buf, "%k:%M:%S %b %d, %Y", parts); - return buf; + struct tm *parts = localtime(&tm); + (void)strftime(buf, sizeof buf, "%k:%M:%S %b %d, %Y", parts); + return buf; } /* Print out a type field giving only those attributes the user can set. */ void Targ_PrintType(int type) { - int tbit; - -#define PRINTBIT(attr) case CONCAT(OP_,attr): debug_printf(" ." #attr); break -#define PRINTDBIT(attr) case CONCAT(OP_,attr): if (DEBUG(TARG))debug_printf(" ." #attr); break - - type &= ~OP_OPMASK; - - while (type) { - tbit = 1 << (ffs(type) - 1); - type &= ~tbit; - - switch(tbit) { - PRINTBIT(OPTIONAL); - PRINTBIT(USE); - PRINTBIT(EXEC); - PRINTBIT(IGNORE); - PRINTBIT(PRECIOUS); - PRINTBIT(SILENT); - PRINTBIT(MAKE); - PRINTBIT(JOIN); - PRINTBIT(INVISIBLE); - PRINTBIT(NOTMAIN); - PRINTDBIT(LIB); - /*XXX: MEMBER is defined, so CONCAT(OP_,MEMBER) gives OP_"%" */ - case OP_MEMBER: if (DEBUG(TARG))debug_printf(" .MEMBER"); break; - PRINTDBIT(ARCHV); - PRINTDBIT(MADE); - PRINTDBIT(PHONY); + int tbit; + + type &= ~OP_OPMASK; + + while (type != 0) { + tbit = 1 << (ffs(type) - 1); + type &= ~tbit; + + switch (tbit) { +#define PRINTBIT(bit, attr) case bit: debug_printf(" " attr); break +#define PRINTDBIT(bit, attr) case bit: DEBUG0(TARG, " " attr); break + PRINTBIT(OP_OPTIONAL, ".OPTIONAL"); + PRINTBIT(OP_USE, ".USE"); + PRINTBIT(OP_EXEC, ".EXEC"); + PRINTBIT(OP_IGNORE, ".IGNORE"); + PRINTBIT(OP_PRECIOUS, ".PRECIOUS"); + PRINTBIT(OP_SILENT, ".SILENT"); + PRINTBIT(OP_MAKE, ".MAKE"); + PRINTBIT(OP_JOIN, ".JOIN"); + PRINTBIT(OP_INVISIBLE, ".INVISIBLE"); + PRINTBIT(OP_NOTMAIN, ".NOTMAIN"); + PRINTDBIT(OP_LIB, ".LIB"); + PRINTDBIT(OP_MEMBER, ".MEMBER"); + PRINTDBIT(OP_ARCHV, ".ARCHV"); + PRINTDBIT(OP_MADE, ".MADE"); + PRINTDBIT(OP_PHONY, ".PHONY"); +#undef PRINTBIT +#undef PRINTDBIT + } } - } } static const char * made_name(GNodeMade made) { - switch (made) { - case UNMADE: return "unmade"; - case DEFERRED: return "deferred"; - case REQUESTED: return "requested"; - case BEINGMADE: return "being made"; - case MADE: return "made"; - case UPTODATE: return "up-to-date"; - case ERROR: return "error when made"; - case ABORTED: return "aborted"; - default: return "unknown enum_made value"; - } + switch (made) { + case UNMADE: return "unmade"; + case DEFERRED: return "deferred"; + case REQUESTED: return "requested"; + case BEINGMADE: return "being made"; + case MADE: return "made"; + case UPTODATE: return "up-to-date"; + case ERROR: return "error when made"; + case ABORTED: return "aborted"; + default: return "unknown enum_made value"; + } } static const char * GNode_OpName(const GNode *gn) { - switch (gn->type & OP_OPMASK) { - case OP_DEPENDS: - return ":"; - case OP_FORCE: - return "!"; - case OP_DOUBLEDEP: - return "::"; - } - return ""; + switch (gn->type & OP_OPMASK) { + case OP_DEPENDS: + return ":"; + case OP_FORCE: + return "!"; + case OP_DOUBLEDEP: + return "::"; + } + return ""; } /* Print the contents of a node. */ void Targ_PrintNode(GNode *gn, int pass) { - debug_printf("# %s%s", gn->name, gn->cohort_num); - GNode_FprintDetails(opts.debug_file, ", ", gn, "\n"); - if (gn->flags == 0) - return; + debug_printf("# %s%s", gn->name, gn->cohort_num); + GNode_FprintDetails(opts.debug_file, ", ", gn, "\n"); + if (gn->flags == 0) + return; + + if (!GNode_IsTarget(gn)) + return; - if (GNode_IsTarget(gn)) { debug_printf("#\n"); - if (gn == mainTarg) { - debug_printf("# *** MAIN TARGET ***\n"); - } + if (gn == mainTarg) + debug_printf("# *** MAIN TARGET ***\n"); + if (pass >= 2) { - if (gn->unmade > 0) { - debug_printf("# %d unmade children\n", gn->unmade); - } else { - debug_printf("# No unmade children\n"); - } - if (!(gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC))) { - if (gn->mtime != 0) { - debug_printf("# last modified %s: %s\n", - Targ_FmtTime(gn->mtime), - made_name(gn->made)); - } else if (gn->made != UNMADE) { - debug_printf("# non-existent (maybe): %s\n", - made_name(gn->made)); - } else { - debug_printf("# unmade\n"); + if (gn->unmade > 0) + debug_printf("# %d unmade children\n", gn->unmade); + else + debug_printf("# No unmade children\n"); + if (!(gn->type & (OP_JOIN | OP_USE | OP_USEBEFORE | OP_EXEC))) { + if (gn->mtime != 0) { + debug_printf("# last modified %s: %s\n", + Targ_FmtTime(gn->mtime), + made_name(gn->made)); + } else if (gn->made != UNMADE) { + debug_printf("# nonexistent (maybe): %s\n", + made_name(gn->made)); + } else + debug_printf("# unmade\n"); } - } - PrintNodeNamesLine("implicit parents", gn->implicitParents); + PrintNodeNamesLine("implicit parents", &gn->implicitParents); } else { - if (gn->unmade) - debug_printf("# %d unmade children\n", gn->unmade); + if (gn->unmade != 0) + debug_printf("# %d unmade children\n", gn->unmade); } - PrintNodeNamesLine("parents", gn->parents); - PrintNodeNamesLine("order_pred", gn->order_pred); - PrintNodeNamesLine("order_succ", gn->order_succ); + + PrintNodeNamesLine("parents", &gn->parents); + PrintNodeNamesLine("order_pred", &gn->order_pred); + PrintNodeNamesLine("order_succ", &gn->order_succ); debug_printf("%-16s%s", gn->name, GNode_OpName(gn)); Targ_PrintType(gn->type); - PrintNodeNames(gn->children); + PrintNodeNames(&gn->children); debug_printf("\n"); Targ_PrintCmds(gn); debug_printf("\n\n"); - if (gn->type & OP_DOUBLEDEP) { - Targ_PrintNodes(gn->cohorts, pass); - } - } + if (gn->type & OP_DOUBLEDEP) + Targ_PrintNodes(&gn->cohorts, pass); } void Targ_PrintNodes(GNodeList *gnodes, int pass) { - GNodeListNode *ln; - for (ln = gnodes->first; ln != NULL; ln = ln->next) - Targ_PrintNode(ln->datum, pass); + GNodeListNode *ln; + + for (ln = gnodes->first; ln != NULL; ln = ln->next) + Targ_PrintNode(ln->datum, pass); } /* Print only those targets that are just a source. */ static void PrintOnlySources(void) { - GNodeListNode *ln; + GNodeListNode *ln; - for (ln = allTargets->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; - if (GNode_IsTarget(gn)) - continue; + for (ln = allTargets.first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; + if (GNode_IsTarget(gn)) + continue; - debug_printf("#\t%s [%s]", gn->name, GNode_Path(gn)); - Targ_PrintType(gn->type); - debug_printf("\n"); - } + debug_printf("#\t%s [%s]", gn->name, GNode_Path(gn)); + Targ_PrintType(gn->type); + debug_printf("\n"); + } } -/* Input: +/* + * Input: * pass 1 => before processing * 2 => after processing * 3 => after processing, an error occurred */ void Targ_PrintGraph(int pass) { - debug_printf("#*** Input graph:\n"); - Targ_PrintNodes(allTargets, pass); - debug_printf("\n"); - debug_printf("\n"); + debug_printf("#*** Input graph:\n"); + Targ_PrintNodes(&allTargets, pass); + debug_printf("\n"); + debug_printf("\n"); - debug_printf("#\n"); - debug_printf("# Files that are only sources:\n"); - PrintOnlySources(); + debug_printf("#\n"); + debug_printf("# Files that are only sources:\n"); + PrintOnlySources(); - debug_printf("#*** Global Variables:\n"); - Var_Dump(VAR_GLOBAL); + debug_printf("#*** Global Variables:\n"); + Var_Dump(VAR_GLOBAL); - debug_printf("#*** Command-line Variables:\n"); - Var_Dump(VAR_CMDLINE); + debug_printf("#*** Command-line Variables:\n"); + Var_Dump(VAR_CMDLINE); - debug_printf("\n"); - Dir_PrintDirectories(); - debug_printf("\n"); + debug_printf("\n"); + Dir_PrintDirectories(); + debug_printf("\n"); - Suff_PrintAll(); + Suff_PrintAll(); } -/* Propagate some type information to cohort nodes (those from the '::' +/* + * Propagate some type information to cohort nodes (those from the '::' * dependency operator). * * Should be called after the makefiles are parsed but before any action is - * taken. */ + * taken. + */ void Targ_Propagate(void) { - GNodeListNode *ln, *cln; + GNodeListNode *ln, *cln; - for (ln = allTargets->first; ln != NULL; ln = ln->next) { - GNode *gn = ln->datum; - GNodeType type = gn->type; + for (ln = allTargets.first; ln != NULL; ln = ln->next) { + GNode *gn = ln->datum; + GNodeType type = gn->type; - if (!(type & OP_DOUBLEDEP)) - continue; + if (!(type & OP_DOUBLEDEP)) + continue; - for (cln = gn->cohorts->first; cln != NULL; cln = cln->next) { - GNode *cohort = cln->datum; + for (cln = gn->cohorts.first; cln != NULL; cln = cln->next) { + GNode *cohort = cln->datum; - cohort->type |= type & ~OP_OPMASK; + cohort->type |= type & ~OP_OPMASK; + } } - } } diff --git a/trace.c b/trace.c index a129406f2f3f..7506adf51727 100644 --- a/trace.c +++ b/trace.c @@ -1,107 +1,111 @@ -/* $NetBSD: trace.c,v 1.21 2020/10/31 22:05:56 rillig Exp $ */ +/* $NetBSD: trace.c,v 1.25 2020/12/20 14:32:13 rillig Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Bill Sommerfeld * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ /*- * trace.c -- * handle logging of trace events generated by various parts of make. * * Interface: * Trace_Init Initialize tracing (called once during * the lifetime of the process) * * Trace_End Finalize tracing (called before make exits) * * Trace_Log Log an event about a particular make job. */ #include #include "make.h" #include "job.h" #include "trace.h" -MAKE_RCSID("$NetBSD: trace.c,v 1.21 2020/10/31 22:05:56 rillig Exp $"); +MAKE_RCSID("$NetBSD: trace.c,v 1.25 2020/12/20 14:32:13 rillig Exp $"); static FILE *trfile; static pid_t trpid; const char *trwd; static const char *evname[] = { "BEG", "END", "ERR", "JOB", "DON", "INT", }; void Trace_Init(const char *pathname) { if (pathname != NULL) { - void *dontFreeIt; + FStr curDir; trpid = getpid(); /* XXX: This variable may get overwritten later, which * would make trwd point to undefined behavior. */ - trwd = Var_Value(".CURDIR", VAR_GLOBAL, &dontFreeIt); + curDir = Var_Value(".CURDIR", VAR_GLOBAL); + trwd = curDir.str; trfile = fopen(pathname, "a"); } } void Trace_Log(TrEvent event, Job *job) { struct timeval rightnow; if (trfile == NULL) return; gettimeofday(&rightnow, NULL); fprintf(trfile, "%lld.%06ld %d %s %d %s", (long long)rightnow.tv_sec, (long)rightnow.tv_usec, jobTokensRunning, evname[event], trpid, trwd); if (job != NULL) { - fprintf(trfile, " %s %d %x %x", job->node->name, - job->pid, job->flags, job->node->type); + char flags[4]; + + Job_FlagsToString(job, flags, sizeof flags); + fprintf(trfile, " %s %d %s %x", job->node->name, + job->pid, flags, job->node->type); } fputc('\n', trfile); fflush(trfile); } void Trace_End(void) { if (trfile != NULL) fclose(trfile); } diff --git a/trace.h b/trace.h index 758184b98b4a..5fd79acab5aa 100644 --- a/trace.h +++ b/trace.h @@ -1,49 +1,53 @@ -/* $NetBSD: trace.h,v 1.4 2020/10/18 17:19:54 rillig Exp $ */ +/* $NetBSD: trace.h,v 1.5 2020/11/28 08:41:53 rillig Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Bill Sommerfeld * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ /*- * trace.h -- * Definitions pertaining to the tracing of jobs in parallel mode. */ +#ifndef MAKE_TRACE_H +#define MAKE_TRACE_H + typedef enum TrEvent { MAKESTART, MAKEEND, MAKEERROR, JOBSTART, JOBEND, MAKEINTR } TrEvent; void Trace_Init(const char *); void Trace_Log(TrEvent, Job *); void Trace_End(void); +#endif diff --git a/unit-tests/Makefile b/unit-tests/Makefile index cca63155e868..87ed4ef212d4 100644 --- a/unit-tests/Makefile +++ b/unit-tests/Makefile @@ -1,602 +1,693 @@ -# $Id: Makefile,v 1.115 2020/11/18 04:01:07 sjg Exp $ +# $Id: Makefile,v 1.138 2021/01/01 22:55:09 sjg Exp $ # -# $NetBSD: Makefile,v 1.206 2020/11/18 01:12:00 sjg Exp $ +# $NetBSD: Makefile,v 1.260 2020/12/31 03:05:12 rillig Exp $ # # Unit tests for make(1) # # The main targets are: # # all: # run all the tests # test: # run 'all', and compare to expected results # accept: # move generated output to expected results # # Settable variables # # TEST_MAKE # The make program to be tested. # # # Adding a test case # # Each feature should get its own set of tests in its own suitably # named makefile (*.mk), with its own set of expected results (*.exp), # and it should be added to the TESTS list. # # A few *.mk files are helper files for other tests (such as include-sub.mk) # and are thus not added to TESTS. Such files must be ignored in # src/tests/usr.bin/make/t_make.sh. # +# we use these below but we might be an older make +.MAKE.OS?= ${uname -s:L:sh} +.MAKE.UID?= ${id -u:L:sh} + # Each test is in a sub-makefile. # Keep the list sorted. # Any test that is commented out must be ignored in # src/tests/usr.bin/make/t_make.sh as well. #TESTS+= archive -TESTS+= archive-suffix +#TESTS+= archive-suffix TESTS+= cmd-errors +TESTS+= cmd-errors-jobs TESTS+= cmd-errors-lint TESTS+= cmd-interrupt TESTS+= cmdline TESTS+= cmdline-undefined TESTS+= comment +TESTS+= compat-error TESTS+= cond-cmp-numeric TESTS+= cond-cmp-numeric-eq TESTS+= cond-cmp-numeric-ge TESTS+= cond-cmp-numeric-gt TESTS+= cond-cmp-numeric-le TESTS+= cond-cmp-numeric-lt TESTS+= cond-cmp-numeric-ne TESTS+= cond-cmp-string TESTS+= cond-cmp-unary +TESTS+= cond-eof TESTS+= cond-func TESTS+= cond-func-commands TESTS+= cond-func-defined TESTS+= cond-func-empty TESTS+= cond-func-exists TESTS+= cond-func-make +TESTS+= cond-func-make-main TESTS+= cond-func-target TESTS+= cond-late TESTS+= cond-op TESTS+= cond-op-and TESTS+= cond-op-and-lint TESTS+= cond-op-not TESTS+= cond-op-or TESTS+= cond-op-or-lint TESTS+= cond-op-parentheses TESTS+= cond-short TESTS+= cond-token-number TESTS+= cond-token-plain TESTS+= cond-token-string TESTS+= cond-token-var TESTS+= cond-undef-lint TESTS+= cond1 TESTS+= counter TESTS+= counter-append TESTS+= dep TESTS+= dep-colon TESTS+= dep-colon-bug-cross-file TESTS+= dep-double-colon TESTS+= dep-double-colon-indep TESTS+= dep-exclam TESTS+= dep-none TESTS+= dep-percent TESTS+= dep-var TESTS+= dep-wildcards TESTS+= depsrc TESTS+= depsrc-end TESTS+= depsrc-exec TESTS+= depsrc-ignore TESTS+= depsrc-made TESTS+= depsrc-make TESTS+= depsrc-meta TESTS+= depsrc-nometa TESTS+= depsrc-nometa_cmp TESTS+= depsrc-nopath TESTS+= depsrc-notmain TESTS+= depsrc-optional TESTS+= depsrc-phony TESTS+= depsrc-precious TESTS+= depsrc-recursive TESTS+= depsrc-silent TESTS+= depsrc-use TESTS+= depsrc-usebefore TESTS+= depsrc-usebefore-double-colon TESTS+= depsrc-wait TESTS+= deptgt TESTS+= deptgt-begin +TESTS+= deptgt-begin-fail +TESTS+= deptgt-begin-fail-indirect TESTS+= deptgt-default TESTS+= deptgt-delete_on_error TESTS+= deptgt-end +TESTS+= deptgt-end-fail +TESTS+= deptgt-end-fail-all +TESTS+= deptgt-end-fail-indirect TESTS+= deptgt-end-jobs TESTS+= deptgt-error TESTS+= deptgt-ignore TESTS+= deptgt-interrupt TESTS+= deptgt-main TESTS+= deptgt-makeflags TESTS+= deptgt-no_parallel TESTS+= deptgt-nopath TESTS+= deptgt-notparallel TESTS+= deptgt-objdir TESTS+= deptgt-order TESTS+= deptgt-path TESTS+= deptgt-path-suffix TESTS+= deptgt-phony TESTS+= deptgt-precious TESTS+= deptgt-shell TESTS+= deptgt-silent TESTS+= deptgt-stale TESTS+= deptgt-suffixes TESTS+= dir TESTS+= dir-expand-path TESTS+= directive TESTS+= directive-dinclude TESTS+= directive-elif TESTS+= directive-elifdef TESTS+= directive-elifmake TESTS+= directive-elifndef TESTS+= directive-elifnmake TESTS+= directive-else +TESTS+= directive-endfor TESTS+= directive-endif TESTS+= directive-error TESTS+= directive-export TESTS+= directive-export-env +TESTS+= directive-export-impl TESTS+= directive-export-gmake TESTS+= directive-export-literal TESTS+= directive-for +TESTS+= directive-for-errors +TESTS+= directive-for-escape TESTS+= directive-for-generating-endif +TESTS+= directive-for-lines +TESTS+= directive-for-null TESTS+= directive-hyphen-include TESTS+= directive-if TESTS+= directive-if-nested TESTS+= directive-ifdef TESTS+= directive-ifmake TESTS+= directive-ifndef TESTS+= directive-ifnmake TESTS+= directive-include TESTS+= directive-include-fatal TESTS+= directive-info +TESTS+= directive-misspellings TESTS+= directive-sinclude TESTS+= directive-undef TESTS+= directive-unexport TESTS+= directive-unexport-env TESTS+= directive-warning TESTS+= dollar TESTS+= doterror TESTS+= dotwait TESTS+= envfirst TESTS+= error TESTS+= # escape # broken by reverting POSIX changes TESTS+= export TESTS+= export-all TESTS+= export-env TESTS+= export-variants TESTS+= forloop TESTS+= forsubst TESTS+= gnode-submake TESTS+= hanoi-include TESTS+= impsrc TESTS+= include-main TESTS+= job-flags #TESTS+= job-output-long-lines +TESTS+= jobs-error-indirect +TESTS+= jobs-error-nested +TESTS+= jobs-error-nested-make TESTS+= lint TESTS+= make-exported +TESTS+= meta-cmd-cmp TESTS+= moderrs TESTS+= modmatch TESTS+= modmisc TESTS+= modts TESTS+= modword +.if ${.MAKE.UID} > 0 TESTS+= objdir-writable +.endif TESTS+= opt TESTS+= opt-backwards TESTS+= opt-chdir TESTS+= opt-debug TESTS+= opt-debug-all TESTS+= opt-debug-archive TESTS+= opt-debug-curdir TESTS+= opt-debug-cond TESTS+= opt-debug-dir TESTS+= opt-debug-errors TESTS+= opt-debug-file TESTS+= opt-debug-for TESTS+= opt-debug-graph1 TESTS+= opt-debug-graph2 TESTS+= opt-debug-graph3 TESTS+= opt-debug-hash #TESTS+= opt-debug-jobs TESTS+= opt-debug-lint TESTS+= opt-debug-loud TESTS+= opt-debug-meta TESTS+= opt-debug-making TESTS+= opt-debug-no-rm TESTS+= opt-debug-parse TESTS+= opt-debug-suff TESTS+= opt-debug-targets TESTS+= opt-debug-varraw TESTS+= opt-debug-var TESTS+= opt-debug-x-trace TESTS+= opt-define TESTS+= opt-env TESTS+= opt-file TESTS+= opt-ignore TESTS+= opt-include-dir TESTS+= opt-jobs TESTS+= opt-jobs-internal +TESTS+= opt-jobs-no-action TESTS+= opt-keep-going +TESTS+= opt-keep-going-multiple TESTS+= opt-m-include-dir TESTS+= opt-no-action TESTS+= opt-no-action-at-all +TESTS+= opt-no-action-runflags TESTS+= opt-query TESTS+= opt-raw TESTS+= opt-silent TESTS+= opt-touch TESTS+= opt-touch-jobs TESTS+= opt-tracefile TESTS+= opt-var-expanded TESTS+= opt-var-literal TESTS+= opt-warnings-as-errors TESTS+= opt-where-am-i TESTS+= opt-x-reduce-exported TESTS+= order TESTS+= parse-var TESTS+= phony-end TESTS+= posix TESTS+= # posix1 # broken by reverting POSIX changes -TESTS+= qequals TESTS+= recursive TESTS+= sh TESTS+= sh-dots +TESTS+= sh-errctl +TESTS+= sh-flags TESTS+= sh-jobs TESTS+= sh-jobs-error TESTS+= sh-leading-at TESTS+= sh-leading-hyphen TESTS+= sh-leading-plus TESTS+= sh-meta-chars TESTS+= sh-multi-line TESTS+= sh-single-line TESTS+= shell-csh TESTS+= shell-custom .if exists(/bin/ksh) TESTS+= shell-ksh .endif TESTS+= shell-sh TESTS+= suff-add-later TESTS+= suff-clear-regular TESTS+= suff-clear-single +TESTS+= suff-incomplete TESTS+= suff-lookup TESTS+= suff-main +TESTS+= suff-main-several +TESTS+= suff-phony TESTS+= suff-rebuild TESTS+= suff-self +TESTS+= suff-transform-debug TESTS+= suff-transform-endless TESTS+= suff-transform-expand TESTS+= suff-transform-select TESTS+= sunshcmd TESTS+= ternary TESTS+= unexport TESTS+= unexport-env TESTS+= use-inference TESTS+= var-class TESTS+= var-class-cmdline TESTS+= var-class-env TESTS+= var-class-global TESTS+= var-class-local TESTS+= var-class-local-legacy TESTS+= var-op TESTS+= var-op-append TESTS+= var-op-assign TESTS+= var-op-default TESTS+= var-op-expand TESTS+= var-op-shell TESTS+= var-op-sunsh TESTS+= var-recursive TESTS+= varcmd TESTS+= vardebug TESTS+= varfind TESTS+= varmisc TESTS+= varmod TESTS+= varmod-assign TESTS+= varmod-defined TESTS+= varmod-edge TESTS+= varmod-exclam-shell TESTS+= varmod-extension TESTS+= varmod-gmtime TESTS+= varmod-hash TESTS+= varmod-head TESTS+= varmod-ifelse +TESTS+= varmod-indirect TESTS+= varmod-l-name-to-value TESTS+= varmod-localtime TESTS+= varmod-loop TESTS+= varmod-match TESTS+= varmod-match-escape TESTS+= varmod-no-match TESTS+= varmod-order TESTS+= varmod-order-reverse TESTS+= varmod-order-shuffle TESTS+= varmod-path TESTS+= varmod-quote TESTS+= varmod-quote-dollar TESTS+= varmod-range TESTS+= varmod-remember TESTS+= varmod-root TESTS+= varmod-select-words TESTS+= varmod-shell TESTS+= varmod-subst TESTS+= varmod-subst-regex TESTS+= varmod-sysv TESTS+= varmod-tail TESTS+= varmod-to-abs TESTS+= varmod-to-lower TESTS+= varmod-to-many-words TESTS+= varmod-to-one-word TESTS+= varmod-to-separator TESTS+= varmod-to-upper TESTS+= varmod-undefined TESTS+= varmod-unique TESTS+= varname TESTS+= varname-dollar TESTS+= varname-dot-alltargets TESTS+= varname-dot-curdir TESTS+= varname-dot-includes TESTS+= varname-dot-includedfromdir TESTS+= varname-dot-includedfromfile TESTS+= varname-dot-libs TESTS+= varname-dot-make-dependfile TESTS+= varname-dot-make-expand_variables TESTS+= varname-dot-make-exported TESTS+= varname-dot-make-jobs TESTS+= varname-dot-make-jobs-prefix TESTS+= varname-dot-make-level TESTS+= varname-dot-make-makefile_preference TESTS+= varname-dot-make-makefiles TESTS+= varname-dot-make-meta-bailiwick TESTS+= varname-dot-make-meta-created TESTS+= varname-dot-make-meta-files TESTS+= varname-dot-make-meta-ignore_filter TESTS+= varname-dot-make-meta-ignore_paths TESTS+= varname-dot-make-meta-ignore_patterns TESTS+= varname-dot-make-meta-prefix TESTS+= varname-dot-make-mode TESTS+= varname-dot-make-path_filemon TESTS+= varname-dot-make-pid TESTS+= varname-dot-make-ppid TESTS+= varname-dot-make-save_dollars +TESTS+= varname-dot-makeflags TESTS+= varname-dot-makeoverrides TESTS+= varname-dot-newline TESTS+= varname-dot-objdir TESTS+= varname-dot-parsedir TESTS+= varname-dot-parsefile TESTS+= varname-dot-path TESTS+= varname-dot-shell TESTS+= varname-dot-targets TESTS+= varname-empty TESTS+= varname-make TESTS+= varname-make_print_var_on_error TESTS+= varname-make_print_var_on_error-jobs TESTS+= varname-makefile TESTS+= varname-makeflags TESTS+= varname-pwd TESTS+= varname-vpath TESTS+= varparse-dynamic TESTS+= varparse-errors TESTS+= varparse-mod TESTS+= varparse-undef-partial TESTS+= varquote # Ideas for more tests: # char-0020-space.mk # char-005C-backslash.mk # escape-cond-str.mk # escape-cond-func-arg.mk # escape-cond-func-arg.mk # escape-varmod.mk # escape-varmod-define.mk # escape-varmod-match.mk # escape-varname.mk # escape-varassign-varname.mk # escape-varassign-varname-cmdline.mk # escape-varassign-value.mk # escape-varassign-value-cmdline.mk # escape-dependency-source.mk # escape-dependency-target.mk # escape-for-varname.mk # escape-for-item.mk # posix-*.mk (see posix.mk and posix1.mk) .if ${.OBJDIR} != ${.CURDIR} RO_OBJDIR:= ${.OBJDIR}/roobj .else RO_OBJDIR:= ${TMPDIR:U/tmp}/roobj .endif # Additional environment variables for some of the tests. # The base environment is -i PATH="$PATH". ENV.depsrc-optional+= TZ=UTC ENV.envfirst= FROM_ENV=value-from-env ENV.objdir-writable+= RO_OBJDIR=${RO_OBJDIR} ENV.varmisc= FROM_ENV=env ENV.varmisc+= FROM_ENV_BEFORE=env ENV.varmisc+= FROM_ENV_AFTER=env ENV.varmod-localtime+= TZ=Europe/Berlin ENV.varname-vpath+= VPATH=varname-vpath.dir:varname-vpath.dir2 # Override make flags for some of the tests; default is -k. # If possible, write ".MAKEFLAGS: -dv" in the test .mk file instead of # settings FLAGS.test=-dv here, since that is closer to the test code. -FLAGS.cond-func-make= via-cmdline -FLAGS.directive-ifmake= first second -FLAGS.doterror= # none, especially not -k -FLAGS.varname-empty= -dv '$${:U}=cmdline-u' '=cmdline-plain' +FLAGS.cond-func-make= via-cmdline +FLAGS.directive-ifmake= first second +FLAGS.doterror= # none, especially not -k +FLAGS.jobs-error-indirect= # none, especially not -k +FLAGS.jobs-error-nested= # none, especially not -k +FLAGS.jobs-error-nested-make= # none, especially not -k +FLAGS.varname-empty= -dv '$${:U}=cmdline-u' '=cmdline-plain' # Some tests need extra postprocessing. -SED_CMDS.export= \ - -e '/^[^=_A-Za-z0-9]*=/d' -# these all share the same requirement -.for t in export-all export-env -SED_CMDS.$t= ${SED_CMDS.export} -.endfor -SED_CMDS.directive-export-gmake= \ - ${:D dash is a pain } \ - -e /non-zero/d +SED_CMDS.dir= ${:D remove output from -DCLEANUP mode } +SED_CMDS.dir+= -e '/^OpenDirs_Done:/d' +SED_CMDS.dir+= -e '/^CachedDir /d' +SED_CMDS.export= -e '/^[^=_A-Za-z0-9]*=/d' +SED_CMDS.export-all= ${SED_CMDS.export} +SED_CMDS.export-env= ${SED_CMDS.export} +SED_CMDS.cmdline= -e 's,uid${.MAKE.UID}/,,' SED_CMDS.job-output-long-lines= \ ${:D Job separators on their own line are ok. } \ -e '/^--- job-[ab] ---$$/d' \ ${:D Plain output lines are ok as well. } \ ${:D They may come in multiples of 1024 or as 10000. } \ -e '/^aa*$$/d' \ -e '/^bb*$$/d' \ ${:D The following lines should rather not occur since the job } \ ${:D marker should always be at the beginning of the line. } \ -e '/^aa*--- job-b ---$$/d' \ -e '/^bb*--- job-a ---$$/d' -SED_CMDS.objdir-writable= -e 's,${RO_OBJDIR},OBJDIR/roobj,g' -SED_CMDS.opt-debug-graph1= \ - -e 's,${.CURDIR},CURDIR,' -SED_CMDS.opt-debug-graph1+= \ - -e '/Global Variables:/,/Suffixes:/d' -SED_CMDS.sh-dots= -e 's,^.*\.\.\.:.*,,' +SED_CMDS.objdir-writable= -e 's,${RO_OBJDIR},OBJDIR/roobj,g' +SED_CMDS.opt-debug-graph1= ${STD_SED_CMDS.dg1} SED_CMDS.opt-debug-jobs= -e 's,([0-9][0-9]*),(),' SED_CMDS.opt-debug-jobs+= -e 's,pid [0-9][0-9]*,pid ,' SED_CMDS.opt-debug-jobs+= -e 's,Process [0-9][0-9]*,Process ,' SED_CMDS.opt-debug-jobs+= -e 's,JobFinish: [0-9][0-9]*,JobFinish: ,' +SED_CMDS.opt-debug-jobs+= -e 's,Command: ${.SHELL:T},Command: ,' # The "-q" may be there or not, see jobs.c, variable shells. -SED_CMDS.opt-debug-jobs+= -e 's,^\(.Command: sh\) -q,\1,' -SED_CMDS.var-op-shell+= -e 's,^${.SHELL:T}: ,,' -SED_CMDS.var-op-shell+= -e '/command/{ s,^[1-9]: ,,;s,No such.*,not found,; }' -SED_CMDS.vardebug= \ - ${:D canonicalize .SHELL } \ - -e 's,${.SHELL},,' +SED_CMDS.opt-debug-jobs+= -e 's,^\(.Command: \) -q,\1,' +SED_CMDS.opt-jobs-no-action= ${STD_SED_CMDS.hide-from-output} +SED_CMDS.opt-no-action-runflags= ${STD_SED_CMDS.hide-from-output} +# For Compat_RunCommand, useShell == FALSE. +SED_CMDS.sh-dots= -e 's,^.*\.\.\.:.*,,' +# For Compat_RunCommand, useShell == TRUE. +SED_CMDS.sh-dots+= -e 's,^make: exec(\(.*\)) failed (.*)$$,,' +SED_CMDS.sh-dots+= -e 's,^\(\*\*\* Error code \)[1-9][0-9]*,\1,' +SED_CMDS.sh-errctl= ${STD_SED_CMDS.dj} +SED_CMDS.sh-flags= ${STD_SED_CMDS.hide-from-output} +SED_CMDS.suff-main+= ${STD_SED_CMDS.dg1} +SED_CMDS.suff-main-several+= ${STD_SED_CMDS.dg1} +SED_CMDS.suff-transform-debug+= ${STD_SED_CMDS.dg1} +SED_CMDS.var-op-shell+= \ + -e 's,^${.SHELL:T}: [ 0-9:]*,,' \ + -e 's,^${.SHELL:T}: ,,' \ + -e '/command/s,No such.*,not found,' +SED_CMDS.vardebug+= -e 's,${.SHELL},,' SED_CMDS.varmod-subst-regex+= \ -e 's,\(Regex compilation error:\).*,\1 (details omitted),' -SED_CMDS.varmod-edge+= -e 's, line [0-9]*:, line omitted:,' SED_CMDS.varname-dot-parsedir= -e '/in some cases/ s,^make: "[^"]*,make: ",' SED_CMDS.varname-dot-parsefile= -e '/in some cases/ s,^make: "[^"]*,make: ",' SED_CMDS.varname-dot-shell= -e 's, = /[^ ]*, = (details omitted),g' SED_CMDS.varname-dot-shell+= -e 's,"/[^" ]*","(details omitted)",g' SED_CMDS.varname-dot-shell+= -e 's,\[/[^] ]*\],[(details omitted)],g' # Some tests need an additional round of postprocessing. -POSTPROC.deptgt-suffixes= \ - ${TOOL_SED} -n -e '/^\#\*\*\* Suffixes/,/^\#\*/p' -POSTPROC.gnode-submake= awk '/Input graph/, /^$$/' -POSTPROC.varname-empty= ${TOOL_SED} -n -e '/^Var_Set/p' -e '/^out:/p' +POSTPROC.deptgt-suffixes= awk '/^\#\*\*\* Suffixes/,/^never-stop/' +POSTPROC.gnode-submake= awk '/Input graph/, /^$$/' +POSTPROC.varname-empty= ${TOOL_SED} -n -e '/^Var_Set/p' -e '/^out:/p' # Some tests reuse other tests, which makes them unnecessarily fragile. export-all.rawout: export.mk unexport.rawout: export.mk unexport-env.rawout: export.mk # End of the configuration section. +# Some standard sed commands, to be used in the SED_CMDS above. + +# Omit details such as process IDs from the output of the -dg1 option. +STD_SED_CMDS.dg1= -e 's,${.CURDIR}$$,,' +STD_SED_CMDS.dg1+= -e '/\.MAKE.PATH_FILEMON/d' +STD_SED_CMDS.dg1+= -e '/^MAKE_VERSION/d;/^\#.*\/mk/d' +STD_SED_CMDS.dg1+= -e 's, ${DEFSYSPATH:U/usr/share/mk}$$, ,' +STD_SED_CMDS.dg1+= -e 's,^\(\.MAKE *=\) .*,\1
,' +STD_SED_CMDS.dg1+= -e 's,^\(\.MAKE\.[A-Z_]* *=\) .*,\1
,' +STD_SED_CMDS.dg1+= -e 's,^\(MACHINE[_ARCH]* *=\) .*,\1
,' +STD_SED_CMDS.dg1+= -e 's,^\(MAKE *=\) .*,\1
,' + +# Omit details such as process IDs from the output of the -dj option. +STD_SED_CMDS.dj= \ + -e '/Process/d;/JobFinish:/d' \ + -e 's,^\(Job_TokenWithdraw\)([0-9]*),\1(),' \ + -e 's,^([0-9][0-9]*) \(withdrew token\),() \1,' \ + -e 's, \(pid\) [0-9][0-9]*, \1 ,' \ + -e 's,^\( Command:\) .*,\1 ,' + +# Reduce the noise for tests running with the -n option, since there is no +# other way to suppress the echoing of the commands. +STD_SED_CMDS.hide-from-output= \ + -e '/^echo hide-from-output/d' \ + -e 's,hide-from-output ,,' \ + -e 's,hide-from-output,,' + +# End of the configuration helpers section. + .MAIN: all .-include "Makefile.inc" .-include "Makefile.config" UNIT_TESTS:= ${.PARSEDIR} .PATH: ${UNIT_TESTS} .if ${USE_ABSOLUTE_TESTNAMES:Uno} == yes OUTFILES= ${TESTS:@test@${.CURDIR:tA}/${test}.out@} .else OUTFILES= ${TESTS:=.out} .endif all: ${OUTFILES} CLEANFILES= *.rawout *.out *.status *.tmp *.core *.tmp CLEANFILES+= obj*.[och] lib*.a # posix1.mk CLEANFILES+= issue* .[ab]* # suffixes.mk CLEANDIRS= dir dummy # posix1.mk clean: rm -f ${CLEANFILES} rm -rf ${CLEANDIRS} TEST_MAKE?= ${.MAKE} TOOL_SED?= sed TOOL_TR?= tr TOOL_DIFF?= diff DIFF_FLAGS?= -u .if defined(.PARSEDIR) # ensure consistent results from sort(1) LC_ALL= C LANG= C .export LANG LC_ALL .endif .if ${.MAKE.MODE:Unormal:Mmeta} != "" # we don't need the noise _MKMSG_TEST= : .endif MAKE_TEST_ENV?= MALLOC_OPTIONS="JA" # for jemalloc +.if ${.MAKE.OS} == "NetBSD" +LIMIT_RESOURCES?= ulimit -v 200000 +.endif +LIMIT_RESOURCES?= : + # Each test is run in a sub-make, to keep the tests for interfering with # each other, and because they use different environment variables and # command line options. .SUFFIXES: .mk .rawout .out .mk.rawout: @${_MKMSG_TEST:Uecho '# test '} ${.PREFIX} @set -eu; \ + ${LIMIT_RESOURCES}; \ cd ${.OBJDIR}; \ env -i PATH="$$PATH" ${MAKE_TEST_ENV} ${ENV.${.PREFIX:T}} \ ${TEST_MAKE} \ -r -C ${.CURDIR} -f ${.IMPSRC} \ ${FLAGS.${.PREFIX:T}:U-k} \ > ${.TARGET}.tmp 2>&1 \ && status=$$? || status=$$?; \ echo $$status > ${.TARGET:R}.status @mv ${.TARGET}.tmp ${.TARGET} # Postprocess the test output so that the results can be compared. # # always pretend .MAKE was called 'make' _SED_CMDS+= -e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,' _SED_CMDS+= -e 's,${TEST_MAKE:S,.,\\.,g},make,' _SED_CMDS+= -e 's,${TEST_MAKE:T:S,.,\\.,g}[][0-9]* warning,make warning,' _SED_CMDS+= -e 's,^usage: ${TEST_MAKE:T:S,.,\\.,g} ,usage: make ,' # replace anything after 'stopped in' with unit-tests _SED_CMDS+= -e '/stopped/s, /.*, unit-tests,' # strip ${.CURDIR}/ from the output _SED_CMDS+= -e 's,${.CURDIR:S,.,\\.,g}/,,g' _SED_CMDS+= -e 's,${UNIT_TESTS:S,.,\\.,g}/,,g' +# on AT&T derrived systems; false exits 255 not 1 +.if ${.MAKE.OS:N*BSD} != "" +_SED_CMDS+= -e 's,\(Error code\) 255,\1 1,' +.endif .rawout.out: @${TOOL_SED} ${_SED_CMDS} ${SED_CMDS.${.PREFIX:T}} \ < ${.IMPSRC} > ${.TARGET}.tmp1 @${POSTPROC.${.PREFIX:T}:Ucat} < ${.TARGET}.tmp1 > ${.TARGET}.tmp2 @rm ${.TARGET}.tmp1 @echo "exit status `cat ${.TARGET:R}.status`" >> ${.TARGET}.tmp2 @mv ${.TARGET}.tmp2 ${.TARGET} +.if empty(DIFF_FLAGS) +DIFF_ECHO= echo +.else +DIFF_ECHO= : +.endif + # Compare all output files test: ${OUTFILES} .PHONY @failed= ; \ for test in ${TESTS}; do \ + cmp -s ${UNIT_TESTS}/$${test}.exp $${test}.out && continue || \ + ${DIFF_ECHO} diff ${UNIT_TESTS}/$${test}.exp $${test}.out; \ ${TOOL_DIFF} ${DIFF_FLAGS} ${UNIT_TESTS}/$${test}.exp $${test}.out \ || failed="$${failed}$${failed:+ }$${test}" ; \ done ; \ if [ -n "$${failed}" ]; then \ echo "Failed tests: $${failed}" ; false ; \ else \ echo "All tests passed" ; \ fi accept: @for test in ${TESTS}; do \ cmp -s ${UNIT_TESTS}/$${test}.exp $${test}.out \ || { echo "Replacing $${test}.exp" ; \ cp $${test}.out ${UNIT_TESTS}/$${test}.exp ; } \ done .if exists(${TEST_MAKE}) ${TESTS:=.rawout}: ${TEST_MAKE} # in meta mode, we *know* if a target script is impacted # by a makefile change. .if ${.MAKE.MODE:Unormal:Mmeta} == "" ${TESTS:=.rawout}: ${.PARSEDIR}/Makefile .endif .endif .-include diff --git a/unit-tests/cmd-errors-jobs.exp b/unit-tests/cmd-errors-jobs.exp new file mode 100644 index 000000000000..6d9c6bb7f890 --- /dev/null +++ b/unit-tests/cmd-errors-jobs.exp @@ -0,0 +1,9 @@ +: undefined eol +make: Unclosed variable "UNCLOSED" +: unclosed-variable +make: Unclosed variable expression (expecting '}') for "UNCLOSED" +: unclosed-modifier +make: Unknown modifier 'Z' +: unknown-modifier eol +: end eol +exit status 0 diff --git a/unit-tests/cmd-errors.mk b/unit-tests/cmd-errors-jobs.mk similarity index 85% copy from unit-tests/cmd-errors.mk copy to unit-tests/cmd-errors-jobs.mk index 5ad4be311873..8462a2e3497e 100644 --- a/unit-tests/cmd-errors.mk +++ b/unit-tests/cmd-errors-jobs.mk @@ -1,30 +1,32 @@ -# $NetBSD: cmd-errors.mk,v 1.3 2020/11/09 23:36:34 rillig Exp $ +# $NetBSD: cmd-errors-jobs.mk,v 1.1 2020/12/27 05:11:40 rillig Exp $ # # Demonstrate how errors in variable expansions affect whether the commands -# are actually executed. +# are actually executed in jobs mode. + +.MAKEFLAGS: -j1 all: undefined unclosed-variable unclosed-modifier unknown-modifier end # Undefined variables are not an error. They expand to empty strings. undefined: : $@ ${UNDEFINED} eol # XXX: As of 2020-11-01, this command is executed even though it contains # parse errors. unclosed-variable: : $@ ${UNCLOSED # XXX: As of 2020-11-01, this command is executed even though it contains # parse errors. unclosed-modifier: : $@ ${UNCLOSED: # XXX: As of 2020-11-01, this command is executed even though it contains # parse errors. unknown-modifier: : $@ ${UNKNOWN:Z} eol end: : $@ eol # XXX: As of 2020-11-02, despite the parse errors, the exit status is 0. diff --git a/unit-tests/cmd-errors.mk b/unit-tests/cmd-errors.mk index 5ad4be311873..356fe1a3e4a2 100644 --- a/unit-tests/cmd-errors.mk +++ b/unit-tests/cmd-errors.mk @@ -1,30 +1,30 @@ -# $NetBSD: cmd-errors.mk,v 1.3 2020/11/09 23:36:34 rillig Exp $ +# $NetBSD: cmd-errors.mk,v 1.4 2020/12/27 05:11:40 rillig Exp $ # # Demonstrate how errors in variable expansions affect whether the commands -# are actually executed. +# are actually executed in compat mode. all: undefined unclosed-variable unclosed-modifier unknown-modifier end # Undefined variables are not an error. They expand to empty strings. undefined: : $@ ${UNDEFINED} eol # XXX: As of 2020-11-01, this command is executed even though it contains # parse errors. unclosed-variable: : $@ ${UNCLOSED # XXX: As of 2020-11-01, this command is executed even though it contains # parse errors. unclosed-modifier: : $@ ${UNCLOSED: # XXX: As of 2020-11-01, this command is executed even though it contains # parse errors. unknown-modifier: : $@ ${UNKNOWN:Z} eol end: : $@ eol # XXX: As of 2020-11-02, despite the parse errors, the exit status is 0. diff --git a/unit-tests/cmdline.mk b/unit-tests/cmdline.mk index cd88cead4558..a3e2de984927 100644 --- a/unit-tests/cmdline.mk +++ b/unit-tests/cmdline.mk @@ -1,36 +1,36 @@ # $NetBSD: cmdline.mk,v 1.2 2020/11/15 14:07:53 rillig Exp $ # # Tests for command line parsing and related special variables. -TMPBASE?= /tmp +TMPBASE?= /tmp/uid${.MAKE.UID} SUB1= a7b41170-53f8-4cc2-bc5c-e4c3dd93ec45 # just a random UUID SUB2= 6a8899d2-d227-4b55-9b6b-f3c8eeb83fd5 # just a random UUID MAKE_CMD= env TMPBASE=${TMPBASE}/${SUB1} ${.MAKE} -f ${MAKEFILE} -r DIR2= ${TMPBASE}/${SUB2} DIR12= ${TMPBASE}/${SUB1}/${SUB2} all: prepare-dirs all: makeobjdir-direct makeobjdir-indirect prepare-dirs: @rm -rf ${DIR2} ${DIR12} @mkdir -p ${DIR2} ${DIR12} # The .OBJDIR can be set via the MAKEOBJDIR command line variable. # It must be a command line variable; an environment variable would not work. makeobjdir-direct: @echo $@: @${MAKE_CMD} MAKEOBJDIR=${DIR2} show-objdir # The .OBJDIR can be set via the MAKEOBJDIR command line variable, # and that variable could even contain the usual modifiers. # Since the .OBJDIR=MAKEOBJDIR assignment happens very early, # the SUB2 variable in the modifier is not defined yet and is therefore empty. # The SUB1 in the resulting path comes from the environment variable TMPBASE, # see MAKE_CMD. makeobjdir-indirect: @echo $@: @${MAKE_CMD} MAKEOBJDIR='$${TMPBASE}/$${SUB2}' show-objdir show-objdir: @echo $@: ${.OBJDIR:Q} diff --git a/unit-tests/compat-error.exp b/unit-tests/compat-error.exp new file mode 100644 index 000000000000..256cb6d4361c --- /dev/null +++ b/unit-tests/compat-error.exp @@ -0,0 +1,15 @@ +: Making success1 out of nothing. +: Making fail1 out of nothing. +false 'fail1' '${.TARGET}' '$${.TARGET}' +*** Error code 1 (continuing) +: Making success2 out of nothing. +: Making fail2 out of nothing. +false 'fail2' '${.TARGET}' '$${.TARGET}' +*** Error code 1 (continuing) +: Making success3 out of nothing. + +Stop. +make: stopped in unit-tests +.ERROR target: +.ERROR command: <> +exit status 1 diff --git a/unit-tests/compat-error.mk b/unit-tests/compat-error.mk new file mode 100644 index 000000000000..4cbc48d4b6bb --- /dev/null +++ b/unit-tests/compat-error.mk @@ -0,0 +1,37 @@ +# $NetBSD: compat-error.mk,v 1.3 2020/12/13 19:33:53 rillig Exp $ +# +# Test detailed error handling in compat mode. +# +# Until 2020-12-13, .ERROR_TARGET was success3, which was wrong. +# Since compat.c 1.215 from 2020-12-13, it is 'fail1', which is the first +# failed top-level target. XXX: Even better would be if .ERROR_TARGET were +# the smallest target that caused the build to fail, even if it were a +# sub-sub-sub-dependency of a top-level target. +# +# XXX: As of 2020-12-13, .ERROR_CMD is empty, which is wrong. +# +# See also: +# Compat_Run +# +# The commit that added the NULL command to gn->commands: +# CVS: 1994.06.06.22.45.?? +# Git: 26a8972fd7f982502c5fbfdabd34578b99d77ca5 +# 1994: Lst_Replace (cmdNode, (ClientData) NULL); +# 2020: LstNode_SetNull(cmdNode); +# +# The commit that skipped NULL commands for .ERROR_CMD: +# CVS: 2016.08.11.19.53.?? +# Git: 58b23478b7353d46457089e726b07a49197388e4 + +.MAKEFLAGS: success1 fail1 success2 fail2 success3 + +success1 success2 success3: + : Making ${.TARGET} out of nothing. + +fail1 fail2: + : Making ${.TARGET} out of nothing. + false '${.TARGET}' '$${.TARGET}' '$$$${.TARGET}' + +.ERROR: + @echo ${.TARGET} target: '<'${.ERROR_TARGET:Q}'>' + @echo ${.TARGET} command: '<'${.ERROR_CMD:Q}'>' diff --git a/unit-tests/cond-eof.exp b/unit-tests/cond-eof.exp new file mode 100644 index 000000000000..3b1e6eb1f056 --- /dev/null +++ b/unit-tests/cond-eof.exp @@ -0,0 +1,9 @@ +side effect +make: "cond-eof.mk" line 15: Malformed conditional (0 ${SIDE_EFFECT} ${SIDE_EFFECT2}) +side effect +make: "cond-eof.mk" line 17: Malformed conditional (1 ${SIDE_EFFECT} ${SIDE_EFFECT2}) +side effect +make: "cond-eof.mk" line 19: Malformed conditional ((0) ${SIDE_EFFECT} ${SIDE_EFFECT2}) +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/cond-eof.mk b/unit-tests/cond-eof.mk new file mode 100644 index 000000000000..08f432bc4593 --- /dev/null +++ b/unit-tests/cond-eof.mk @@ -0,0 +1,20 @@ +# $NetBSD: cond-eof.mk,v 1.2 2020/12/14 20:28:09 rillig Exp $ +# +# Tests for parsing conditions, especially the end of such conditions, which +# are represented as the token TOK_EOF. + +SIDE_EFFECT= ${:!echo 'side effect' 1>&2!} +SIDE_EFFECT2= ${:!echo 'side effect 2' 1>&2!} + +# In the following conditions, ${SIDE_EFFECT} is the position of the first +# parse error. It is always fully evaluated, even if it were not necessary +# to expand the variable expression. This is because these syntax errors are +# an edge case that does not occur during normal operation, therefore there +# is no need to optimize for this case, and it would slow down the common +# case as well. +.if 0 ${SIDE_EFFECT} ${SIDE_EFFECT2} +.endif +.if 1 ${SIDE_EFFECT} ${SIDE_EFFECT2} +.endif +.if (0) ${SIDE_EFFECT} ${SIDE_EFFECT2} +.endif diff --git a/unit-tests/cond-func-empty.mk b/unit-tests/cond-func-empty.mk index f43d99bf92c5..5094924f1c8d 100644 --- a/unit-tests/cond-func-empty.mk +++ b/unit-tests/cond-func-empty.mk @@ -1,159 +1,184 @@ -# $NetBSD: cond-func-empty.mk,v 1.10 2020/11/15 14:07:53 rillig Exp $ +# $NetBSD: cond-func-empty.mk,v 1.11 2020/11/28 14:08:37 rillig Exp $ # # Tests for the empty() function in .if conditions, which tests a variable # expression for emptiness. # # Note that the argument in the parentheses is indeed a variable name, # optionally followed by variable modifiers. # .undef UNDEF EMPTY= # empty SPACE= ${:U } WORD= word # An undefined variable is empty. .if !empty(UNDEF) . error .endif # An undefined variable has the empty string as the value, and the :M # variable modifier does not change that. # .if !empty(UNDEF:M*) . error .endif # The :S modifier replaces the empty value with an actual word. The # expression is now no longer empty, but it is still possible to see whether # the expression was based on an undefined variable. The expression has the # flag VEF_UNDEF. # # The expression does not have the flag VEF_DEF though, therefore it is still # considered undefined. Yes, indeed, undefined but not empty. There are a # few variable modifiers that turn an undefined expression into a defined # expression, among them :U and :D, but not :S. # # XXX: This is hard to explain to someone who doesn't know these # implementation details. # .if !empty(UNDEF:S,^$,value,W) . error .endif # The :U modifier modifies expressions based on undefined variables # (VAR_JUNK) by adding the VAR_KEEP flag, which marks the expression # as "being interesting enough to be further processed". # .if empty(UNDEF:S,^$,value,W:Ufallback) . error .endif # And now to the surprising part. Applying the following :S modifier to the # undefined expression makes it non-empty, but the marker VEF_UNDEF is # preserved nevertheless. The :U modifier that follows only looks at the # VEF_UNDEF flag to decide whether the variable is defined or not. This kind # of makes sense since the :U modifier tests the _variable_, not the # _expression_. # # But since the variable was undefined to begin with, the fallback value from # the :U modifier is used in this expression. # .if ${UNDEF:S,^$,value,W:Ufallback} != "fallback" . error .endif # The variable EMPTY is completely empty (0 characters). .if !empty(EMPTY) . error .endif # The variable SPACE has a single space, which counts as being empty. .if !empty(SPACE) . error .endif # The variable .newline has a single newline, which counts as being empty. .if !empty(.newline) . error .endif # The empty variable named "" gets a fallback value of " ", which counts as # empty. # # Contrary to the other functions in conditionals, the trailing space is not # stripped off, as can be seen in the -dv debug log. If the space had been # stripped, it wouldn't make a difference in this case. # .if !empty(:U ) . error .endif # Now the variable named " " gets a non-empty value, which demonstrates that # neither leading nor trailing spaces are trimmed in the argument of the # function. If the spaces were trimmed, the variable name would be "" and # that variable is indeed undefined. Since ParseEmptyArg calls Var_Parse # without VARE_UNDEFERR, the value of the undefined variable is returned as # an empty string. ${:U }= space .if empty( ) . error .endif # The value of the following expression is " word", which is not empty. .if empty(:U word) . error .endif # The :L modifier creates a variable expression that has the same value as # its name, which both are "VAR" in this case. The value is therefore not # empty. .if empty(VAR:L) . error .endif # The variable WORD has the value "word", which does not count as empty. .if empty(WORD) . error .endif # The expression ${} for a variable with the empty name always evaluates # to an empty string (see Var_Parse, varUndefined). .if !empty() . error .endif # Ensure that variable expressions that appear as part of the argument are # properly parsed. Typical use cases for this are .for loops, which are # expanded to exactly these ${:U} expressions. # # If everything goes well, the argument expands to "WORD", and that variable # is defined at the beginning of this file. The surrounding 'W' and 'D' # ensure that the parser in ParseEmptyArg has the correct position, both # before and after the call to Var_Parse. .if empty(W${:UOR}D) . error .endif # There may be spaces at the outside of the parentheses. # Spaces inside the parentheses are interpreted as part of the variable name. .if ! empty ( WORD ) . error .endif ${:U WORD }= variable name with spaces # Now there is a variable named " WORD ", and it is not empty. .if empty ( WORD ) . error .endif # Parse error: missing closing parenthesis. .if empty(WORD . error .else . error .endif +# Between 2020-06-28 and var.c 1.226 from 2020-07-02, this paragraph generated +# a wrong error message "Variable VARNAME is recursive". +# +# The bug was that the !empty() condition was evaluated, even though this was +# not necessary since the defined() condition already evaluated to false. +# +# When evaluating the !empty condition, the variable name was parsed as +# "VARNAME${:U2}", but without expanding any nested variable expression, in +# this case the ${:U2}. Therefore, the variable name came out as simply +# "VARNAME". Since this variable name should have been discarded quickly after +# parsing it, this unrealistic variable name should have done no harm. +# +# The variable expression was expanded though, and this was wrong. The +# expansion was done without the VARE_WANTRES flag (called VARF_WANTRES back +# then) though. This had the effect that the ${:U1} from the value of VARNAME +# expanded to an empty string. This in turn created the seemingly recursive +# definition VARNAME=${VARNAME}, and that definition was never meant to be +# expanded. +# +# This was fixed by expanding nested variable expressions in the variable name +# only if the flag VARE_WANTRES is given. +VARNAME= ${VARNAME${:U1}} +.if defined(VARNAME${:U2}) && !empty(VARNAME${:U2}) +.endif + all: @:; diff --git a/unit-tests/cond-func-exists.mk b/unit-tests/cond-func-exists.mk index 4a80fb1c393d..48d7e727dc3f 100644 --- a/unit-tests/cond-func-exists.mk +++ b/unit-tests/cond-func-exists.mk @@ -1,42 +1,51 @@ -# $NetBSD: cond-func-exists.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $ +# $NetBSD: cond-func-exists.mk,v 1.6 2020/11/30 20:12:29 rillig Exp $ # # Tests for the exists() function in .if conditions. .if !exists(.) . error .endif # The argument to the function must not be enclosed in quotes. # Neither double quotes nor single quotes are allowed. .if exists(".") . error .endif .if exists('.') . error .endif # The only way to escape characters that would otherwise influence the parser # is to enclose them in a variable expression. For function arguments, # neither the backslash nor the dollar sign act as escape character. .if exists(\.) . error .endif .if !exists(${:U.}) . error .endif # The argument to the function can have several variable expressions. # See cond-func.mk for the characters that cannot be used directly. .if !exists(${.PARSEDIR}/${.PARSEFILE}) . error .endif # Whitespace is trimmed on both sides of the function argument. .if !exists( . ) . error .endif +# The exists function does not really look up the file in the file system, +# instead it uses a cache that is preloaded very early, before parsing the +# first makefile. At that time, the file did not exist yet. +_!= > cond-func-exists.just-created +.if exists(cond-func-exists.just-created) +. error +.endif +_!= rm cond-func-exists.just-created + all: @:; diff --git a/unit-tests/cond-func-make-main.exp b/unit-tests/cond-func-make-main.exp new file mode 100644 index 000000000000..3266459f3bea --- /dev/null +++ b/unit-tests/cond-func-make-main.exp @@ -0,0 +1,3 @@ +: Making dot-main-target-1a. +: Making dot-main-target-1b. +exit status 0 diff --git a/unit-tests/cond-func-make-main.mk b/unit-tests/cond-func-make-main.mk new file mode 100644 index 000000000000..31b370afabde --- /dev/null +++ b/unit-tests/cond-func-make-main.mk @@ -0,0 +1,62 @@ +# $NetBSD: cond-func-make-main.mk,v 1.1 2020/11/22 19:37:27 rillig Exp $ +# +# Test how accurately the make() function in .if conditions reflects +# what is actually made. +# +# There are several ways to specify what is being made: +# +# 1. The default main target is the first target in the given makefiles that +# is not one of the special targets. For example, .PHONY is special when +# it appears on the left-hand side of the ':'. It is not special on the +# right-hand side though. +# +# 2. Command line arguments that are neither options (-ds or -k) nor variable +# assignments (VAR=value) are interpreted as targets to be made. These +# override the default main target from above. +# +# 3. All sources of the first '.MAIN: sources' line. Any further .MAIN line +# is treated as if .MAIN were a regular name. +# +# This test only covers items 1 and 3. For item 2, see cond-func-make.mk. + +first-main-target: + : Making ${.TARGET}. + +# Even though the main-target would actually be made at this point, it is +# ignored by the make() function. +.if make(first-main-target) +. error +.endif + +# Declaring a target via the .MAIN dependency adds it to the targets to be +# created (opts.create), but only that list was empty at the beginning of +# the line. This implies that several main targets can be set at the name +# time, but they have to be in the same dependency group. +# +# See ParseDoDependencyTargetSpecial, branch SP_MAIN. +.MAIN: dot-main-target-1a dot-main-target-1b + +.if !make(dot-main-target-1a) +. error +.endif +.if !make(dot-main-target-1b) +. error +.endif + +dot-main-target-{1,2}{a,b}: + : Making ${.TARGET}. + +# At this point, the list of targets to be made (opts.create) is not empty +# anymore. ParseDoDependencyTargetSpecial therefore treats the .MAIN as if +# it were an ordinary target. Since .MAIN is not listed as a dependency +# anywhere, it is not made. +.if target(.MAIN) +. error +.endif +.MAIN: dot-main-target-2a dot-main-target-2b +.if !target(.MAIN) +. error +.endif +.if make(dot-main-target-2a) +. error +.endif diff --git a/unit-tests/cond-short.exp b/unit-tests/cond-short.exp index fdc38d98a8b7..2865dcb6ef33 100644 --- a/unit-tests/cond-short.exp +++ b/unit-tests/cond-short.exp @@ -1,16 +1,16 @@ expected and expected and exists expected and empty expected U23 condition expected VAR23 expected M pattern expected or expected or exists expected or empty -defined(V42) && 42 > 0: Ok -defined(V66) && ( "" < 42 ): Ok -1 || 42 < 42: Ok -1 || < 42: Ok -0 || 42 <= 42: Ok -0 || < 42: Ok +defined(V42) && ${V42} > 0: Ok +defined(V66) && ( "${iV2}" < ${V42} ): Ok +1 || ${iV1} < ${V42}: Ok +1 || ${iV2:U2} < ${V42}: Ok +0 || ${iV1} <= ${V42}: Ok +0 || ${iV2:U2} < ${V42}: Ok exit status 0 diff --git a/unit-tests/cond-short.mk b/unit-tests/cond-short.mk index 077684be33fc..46c7ea26a97b 100644 --- a/unit-tests/cond-short.mk +++ b/unit-tests/cond-short.mk @@ -1,188 +1,216 @@ -# $NetBSD: cond-short.mk,v 1.12 2020/11/15 14:58:14 rillig Exp $ +# $NetBSD: cond-short.mk,v 1.15 2020/12/01 19:37:23 rillig Exp $ # # Demonstrates that in conditions, the right-hand side of an && or || # is only evaluated if it can actually influence the result. # This is called 'short-circuit evaluation' and is the usual evaluation # mode in most programming languages. A notable exception is Ada, which # distinguishes between the operators 'And', 'And Then', 'Or', 'Or Else'. # -# Between 2015-10-11 and 2020-06-28, the right-hand side of an && or || -# operator was always evaluated, which was wrong. -# TODO: Had the evaluation been correct at some time before 2015-11-12? +# Before 2020-06-28, the right-hand side of an && or || operator was always +# evaluated, which was wrong. In cond.c 1.69 and var.c 1.197 on 2015-10-11, +# Var_Parse got a new parameter named 'wantit'. Since then it would have been +# possible to skip evaluation of irrelevant variable expressions and only +# parse them. They were still evaluated though, the only difference to +# relevant variable expressions was that in the irrelevant variable +# expressions, undefined variables were allowed. # The && operator. .if 0 && ${echo "unexpected and" 1>&2 :L:sh} .endif .if 1 && ${echo "expected and" 1>&2 :L:sh} .endif .if 0 && exists(nonexistent${echo "unexpected and exists" 1>&2 :L:sh}) .endif .if 1 && exists(nonexistent${echo "expected and exists" 1>&2 :L:sh}) .endif .if 0 && empty(${echo "unexpected and empty" 1>&2 :L:sh}) .endif .if 1 && empty(${echo "expected and empty" 1>&2 :L:sh}) .endif # "VAR U11" is not evaluated; it was evaluated before 2020-07-02. # The whole !empty condition is only parsed and then discarded. VAR= ${VAR${:U11${echo "unexpected VAR U11" 1>&2 :L:sh}}} VAR13= ${VAR${:U12${echo "unexpected VAR13" 1>&2 :L:sh}}} .if 0 && !empty(VAR${:U13${echo "unexpected U13 condition" 1>&2 :L:sh}}) .endif VAR= ${VAR${:U21${echo "unexpected VAR U21" 1>&2 :L:sh}}} VAR23= ${VAR${:U22${echo "expected VAR23" 1>&2 :L:sh}}} .if 1 && !empty(VAR${:U23${echo "expected U23 condition" 1>&2 :L:sh}}) .endif VAR= # empty again, for the following tests # The :M modifier is only parsed, not evaluated. # Before 2020-07-02, it was wrongly evaluated. .if 0 && !empty(VAR:M${:U${echo "unexpected M pattern" 1>&2 :L:sh}}) .endif .if 1 && !empty(VAR:M${:U${echo "expected M pattern" 1>&2 :L:sh}}) .endif .if 0 && !empty(VAR:S,from,${:U${echo "unexpected S modifier" 1>&2 :L:sh}},) .endif .if 0 && !empty(VAR:C,from,${:U${echo "unexpected C modifier" 1>&2 :L:sh}},) .endif .if 0 && !empty("" == "" :? ${:U${echo "unexpected ? modifier" 1>&2 :L:sh}} :) .endif .if 0 && !empty(VAR:old=${:U${echo "unexpected = modifier" 1>&2 :L:sh}}) .endif .if 0 && !empty(1 2 3:L:@var@${:U${echo "unexpected @ modifier" 1>&2 :L:sh}}@) .endif .if 0 && !empty(:U${:!echo "unexpected exclam modifier" 1>&2 !}) .endif # Irrelevant assignment modifiers are skipped as well. .if 0 && ${1 2 3:L:@i@${FIRST::?=$i}@} .endif .if 0 && ${1 2 3:L:@i@${LAST::=$i}@} .endif .if 0 && ${1 2 3:L:@i@${APPENDED::+=$i}@} .endif .if 0 && ${echo.1 echo.2 echo.3:L:@i@${RAN::!=${i:C,.*,&; & 1>\&2,:S,., ,g}}@} .endif .if defined(FIRST) || defined(LAST) || defined(APPENDED) || defined(RAN) . warning first=${FIRST} last=${LAST} appended=${APPENDED} ran=${RAN} .endif # The || operator. .if 1 || ${echo "unexpected or" 1>&2 :L:sh} .endif .if 0 || ${echo "expected or" 1>&2 :L:sh} .endif .if 1 || exists(nonexistent${echo "unexpected or exists" 1>&2 :L:sh}) .endif .if 0 || exists(nonexistent${echo "expected or exists" 1>&2 :L:sh}) .endif .if 1 || empty(${echo "unexpected or empty" 1>&2 :L:sh}) .endif .if 0 || empty(${echo "expected or empty" 1>&2 :L:sh}) .endif # Unreachable nested conditions are skipped completely as well. .if 0 . if ${echo "unexpected nested and" 1>&2 :L:sh} . endif .endif .if 1 .elif ${echo "unexpected nested or" 1>&2 :L:sh} .endif # make sure these do not cause complaint #.MAKEFLAGS: -dc # TODO: Rewrite this whole section and check all the conditions and variables. # Several of the assumptions are probably wrong here. # TODO: replace 'x=' with '.info' or '.error'. V42= 42 iV1= ${V42} iV2= ${V66} .if defined(V42) && ${V42} > 0 x= Ok .else x= Fail .endif -x!= echo 'defined(V42) && ${V42} > 0: $x' >&2; echo +x!= echo 'defined(V42) && $${V42} > 0: $x' >&2; echo -# this one throws both String comparison operator and -# Malformed conditional with cond.c 1.78 -# indirect iV2 would expand to "" and treated as 0 +# With cond.c 1.76 from 2020-07-03, the following condition triggered a +# warning: "String comparison operator should be either == or !=". +# This was because the variable expression ${iV2} was defined, but the +# contained variable V66 was undefined. The left-hand side of the comparison +# therefore evaluated to the string "${V66}", which is obviously not a number. +# +# This was fixed in cond.c 1.79 from 2020-07-09 by not evaluating irrelevant +# comparisons. Instead, they are only parsed and then discarded. +# +# At that time, there was not enough debug logging to see the details in the +# -dA log. To actually see it, add debug logging at the beginning and end of +# Var_Parse. .if defined(V66) && ( ${iV2} < ${V42} ) x= Fail .else x= Ok .endif -x!= echo 'defined(V66) && ( "${iV2}" < ${V42} ): $x' >&2; echo +# XXX: This condition doesn't match the one above. The quotes are missing +# above. This is a crucial detail since without quotes, the variable +# expression ${iV2} evaluates to "${V66}", and with quotes, it evaluates to "" +# since undefined variables are allowed and expand to an empty string. +x!= echo 'defined(V66) && ( "$${iV2}" < $${V42} ): $x' >&2; echo -# next two thow String comparison operator with cond.c 1.78 -# indirect iV1 would expand to 42 .if 1 || ${iV1} < ${V42} x= Ok .else x= Fail .endif -x!= echo '1 || ${iV1} < ${V42}: $x' >&2; echo +x!= echo '1 || $${iV1} < $${V42}: $x' >&2; echo +# With cond.c 1.76 from 2020-07-03, the following condition triggered a +# warning: "String comparison operator should be either == or !=". +# This was because the variable expression ${iV2} was defined, but the +# contained variable V66 was undefined. The left-hand side of the comparison +# therefore evaluated to the string "${V66}", which is obviously not a number. +# +# This was fixed in cond.c 1.79 from 2020-07-09 by not evaluating irrelevant +# comparisons. Instead, they are only parsed and then discarded. +# +# At that time, there was not enough debug logging to see the details in the +# -dA log. To actually see it, add debug logging at the beginning and end of +# Var_Parse. .if 1 || ${iV2:U2} < ${V42} x= Ok .else x= Fail .endif -x!= echo '1 || ${iV2:U2} < ${V42}: $x' >&2; echo +x!= echo '1 || $${iV2:U2} < $${V42}: $x' >&2; echo # the same expressions are fine when the lhs is expanded # ${iV1} expands to 42 .if 0 || ${iV1} <= ${V42} x= Ok .else x= Fail .endif -x!= echo '0 || ${iV1} <= ${V42}: $x' >&2; echo +x!= echo '0 || $${iV1} <= $${V42}: $x' >&2; echo # ${iV2:U2} expands to 2 .if 0 || ${iV2:U2} < ${V42} x= Ok .else x= Fail .endif -x!= echo '0 || ${iV2:U2} < ${V42}: $x' >&2; echo +x!= echo '0 || $${iV2:U2} < $${V42}: $x' >&2; echo -# TODO: Has this always worked? There may have been a time, maybe around -# 2000, when make would complain about the "Malformed conditional" because -# UNDEF is not defined. +# The right-hand side of the '&&' is irrelevant since the left-hand side +# already evaluates to false. Before cond.c 1.79 from 2020-07-09, it was +# expanded nevertheless, although with a small modification: undefined +# variables may be used in these expressions without generating an error. .if defined(UNDEF) && ${UNDEF} != "undefined" . error .endif # TODO: Test each modifier to make sure it is skipped when it is irrelevant # for the result. Since this test is already quite long, do that in another # test. all: @:;: diff --git a/unit-tests/cond-token-string.exp b/unit-tests/cond-token-string.exp index 5df4cc675bb1..83009f420325 100644 --- a/unit-tests/cond-token-string.exp +++ b/unit-tests/cond-token-string.exp @@ -1,8 +1,8 @@ -make: Unknown modifier 'Z' +make: "cond-token-string.mk" line 9: Unknown modifier 'Z' make: "cond-token-string.mk" line 9: Malformed conditional ("" != "${:Uvalue:Z}") make: "cond-token-string.mk" line 18: xvalue is not defined. make: "cond-token-string.mk" line 24: Malformed conditional (x${:Uvalue} == "") make: "cond-token-string.mk" line 33: Expected. make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/dep-percent.exp b/unit-tests/dep-percent.exp index 2b5b5bf1fa50..1e6c04d2e167 100644 --- a/unit-tests/dep-percent.exp +++ b/unit-tests/dep-percent.exp @@ -1,3 +1,6 @@ make: don't know how to make dep-percent.o (continuing) `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/depsrc-meta.exp b/unit-tests/depsrc-meta.exp index 39a9383953dd..77e27582f7da 100644 --- a/unit-tests/depsrc-meta.exp +++ b/unit-tests/depsrc-meta.exp @@ -1 +1,5 @@ +Skipping meta for actual-test: no commands +Skipping meta for .END: .SPECIAL +Targets from meta mode: +| TARGET depsrc-meta-target exit status 0 diff --git a/unit-tests/depsrc-meta.mk b/unit-tests/depsrc-meta.mk index 6adef4baa5de..d41aad9a9c96 100644 --- a/unit-tests/depsrc-meta.mk +++ b/unit-tests/depsrc-meta.mk @@ -1,8 +1,31 @@ -# $NetBSD: depsrc-meta.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: depsrc-meta.mk,v 1.4 2020/11/27 08:39:07 rillig Exp $ # # Tests for the special source .META in dependency declarations. # TODO: Implementation +# TODO: Explanation + +.if make(actual-test) + +.MAKEFLAGS: -dM +.MAKE.MODE= meta curDirOk=true + +actual-test: depsrc-meta-target +depsrc-meta-target: .META + @> ${.TARGET}-file + @rm -f ${.TARGET}-file + +.elif make(check-results) + +check-results: + @echo 'Targets from meta mode:' + @awk '/^TARGET/ { print "| " $$0 }' depsrc-meta-target.meta + @rm depsrc-meta-target.meta + +.else all: - @:; + @${MAKE} -f ${MAKEFILE} actual-test + @${MAKE} -f ${MAKEFILE} check-results + +.endif diff --git a/unit-tests/depsrc-optional.exp b/unit-tests/depsrc-optional.exp index fce85b3cb38e..8ecd28266b5e 100644 --- a/unit-tests/depsrc-optional.exp +++ b/unit-tests/depsrc-optional.exp @@ -1,20 +1,20 @@ Make_ExpandUse: examine all ExamineLater: need to examine "important" Make_ExpandUse: examine important ExamineLater: need to examine "optional" ExamineLater: need to examine "optional-cohort" Make_ExpandUse: examine optional Make_ExpandUse: examine optional-cohort -Examining optional...non-existent...up-to-date. -Examining optional-cohort...non-existent...:: operator and no sources...out-of-date. +Examining optional...nonexistent...up-to-date. +Examining optional-cohort...nonexistent...:: operator and no sources...out-of-date. : A leaf node using '::' is considered out-of-date. - recheck(optional-cohort): update time from 0:00:00 Jan 01, 1970 to now -Examining important...non-existent...modified before source "optional-cohort"...out-of-date. + recheck(optional-cohort): update time from nonexistent to now +Examining important...nonexistent...modified before source "optional-cohort"...out-of-date. : important is made. - recheck(important): update time from 0:00:00 Jan 01, 1970 to now -Examining all...non-existent...modified before source "important"...out-of-date. + recheck(important): update time from nonexistent to now +Examining all...nonexistent...modified before source "important"...out-of-date. : all is made. - recheck(all): update time from 0:00:00 Jan 01, 1970 to now -Examining .END...non-existent...non-existent and no sources...out-of-date. - recheck(.END): update time from 0:00:00 Jan 01, 1970 to now + recheck(all): update time from nonexistent to now +Examining .END...nonexistent...nonexistent and no sources...out-of-date. + recheck(.END): update time from nonexistent to now exit status 0 diff --git a/unit-tests/depsrc.exp b/unit-tests/depsrc.exp index 39a9383953dd..06165e6f9ac4 100644 --- a/unit-tests/depsrc.exp +++ b/unit-tests/depsrc.exp @@ -1 +1,4 @@ +: 'Undefined variables are expanded directly in the dependency' +: 'declaration. They are not preserved and maybe expanded later.' +: 'This is in contrast to local variables such as ${.TARGET}.' exit status 0 diff --git a/unit-tests/depsrc.mk b/unit-tests/depsrc.mk index 15b27286de22..ab9d04c1d3a4 100644 --- a/unit-tests/depsrc.mk +++ b/unit-tests/depsrc.mk @@ -1,11 +1,26 @@ -# $NetBSD: depsrc.mk,v 1.3 2020/11/15 20:20:58 rillig Exp $ +# $NetBSD: depsrc.mk,v 1.4 2020/12/22 19:38:44 rillig Exp $ # # Tests for special sources (those starting with a dot, followed by # uppercase letters) in dependency declarations, such as .PHONY. # TODO: Implementation # TODO: Test 'target: ${:U.SILENT}' +# Demonstrate when exactly undefined variables are expanded in a dependency +# declaration. +target: .PHONY source-${DEFINED_LATER} +# +DEFINED_LATER= later +# +source-: .PHONY + : 'Undefined variables are expanded directly in the dependency' + : 'declaration. They are not preserved and maybe expanded later.' + : 'This is in contrast to local variables such as $${.TARGET}.' +source-later: .PHONY + : 'Undefined variables are tried to be expanded in a dependency' + : 'declaration. If that fails because the variable is undefined,' + : 'the expression is preserved and tried to be expanded later.' + all: @:; diff --git a/unit-tests/varname-make_print_var_on_error.exp b/unit-tests/deptgt-begin-fail-indirect.exp similarity index 66% copy from unit-tests/varname-make_print_var_on_error.exp copy to unit-tests/deptgt-begin-fail-indirect.exp index e2f6a429a9fc..59575e839a4a 100644 --- a/unit-tests/varname-make_print_var_on_error.exp +++ b/unit-tests/deptgt-begin-fail-indirect.exp @@ -1,8 +1,6 @@ -fail +false *** Error code 1 (continuing) Stop. make: stopped in unit-tests -.ERROR_TARGET='all' -.ERROR_CMD='' exit status 1 diff --git a/unit-tests/deptgt-begin-fail-indirect.mk b/unit-tests/deptgt-begin-fail-indirect.mk new file mode 100644 index 000000000000..e50b6207b7a1 --- /dev/null +++ b/unit-tests/deptgt-begin-fail-indirect.mk @@ -0,0 +1,16 @@ +# $NetBSD: deptgt-begin-fail-indirect.mk,v 1.1 2020/11/24 19:02:59 rillig Exp $ +# +# Test for a .BEGIN target whose dependency results in an error. +# This stops make immediately and does not build the main targets. +# +# Between 2005-05-08 and 2020-11-24, a failing dependency of the .BEGIN node +# would not stop make from running the main targets. In the end, the exit +# status was even 0. + +.BEGIN: failing + +failing: .PHONY .NOTMAIN + false + +all: + : This is not made. diff --git a/unit-tests/varname-make_print_var_on_error.exp b/unit-tests/deptgt-begin-fail.exp similarity index 66% copy from unit-tests/varname-make_print_var_on_error.exp copy to unit-tests/deptgt-begin-fail.exp index e2f6a429a9fc..59575e839a4a 100644 --- a/unit-tests/varname-make_print_var_on_error.exp +++ b/unit-tests/deptgt-begin-fail.exp @@ -1,8 +1,6 @@ -fail +false *** Error code 1 (continuing) Stop. make: stopped in unit-tests -.ERROR_TARGET='all' -.ERROR_CMD='' exit status 1 diff --git a/unit-tests/deptgt-begin-fail.mk b/unit-tests/deptgt-begin-fail.mk new file mode 100644 index 000000000000..80cea25664ec --- /dev/null +++ b/unit-tests/deptgt-begin-fail.mk @@ -0,0 +1,10 @@ +# $NetBSD: deptgt-begin-fail.mk,v 1.1 2020/11/24 19:02:59 rillig Exp $ +# +# Test for a .BEGIN target whose command results in an error. +# This stops make immediately and does not build the main targets. + +.BEGIN: + false + +all: + : This is not made. diff --git a/unit-tests/varname-make_print_var_on_error.exp b/unit-tests/deptgt-end-fail-all.exp similarity index 66% copy from unit-tests/varname-make_print_var_on_error.exp copy to unit-tests/deptgt-end-fail-all.exp index e2f6a429a9fc..2e2ee11f481a 100644 --- a/unit-tests/varname-make_print_var_on_error.exp +++ b/unit-tests/deptgt-end-fail-all.exp @@ -1,8 +1,7 @@ -fail +: Making all out of nothing. +false *** Error code 1 (continuing) Stop. make: stopped in unit-tests -.ERROR_TARGET='all' -.ERROR_CMD='' exit status 1 diff --git a/unit-tests/deptgt-end-fail-all.mk b/unit-tests/deptgt-end-fail-all.mk new file mode 100644 index 000000000000..4bf160d480f6 --- /dev/null +++ b/unit-tests/deptgt-end-fail-all.mk @@ -0,0 +1,19 @@ +# $NetBSD: deptgt-end-fail-all.mk,v 1.2 2020/12/07 01:04:07 rillig Exp $ +# +# Test whether the commands from the .END target are run even if there is +# an error before. The manual page says "after everything else is done", +# which leaves room for interpretation. +# +# Until 2020-12-07, the .END node was made even if the main nodes had failed. +# This was not intended since the .END node had already been skipped if a +# dependency of the main nodes had failed, just not if one of the main nodes +# themselves had failed. This inconsistency was not worth keeping. To run +# some commands on error, use the .ERROR target instead, see deptgt-error.mk. + +all: .PHONY + : Making ${.TARGET} out of nothing. + false + +.END: + : Making ${.TARGET} out of nothing. + false diff --git a/unit-tests/varname-make_print_var_on_error.exp b/unit-tests/deptgt-end-fail-indirect.exp similarity index 66% copy from unit-tests/varname-make_print_var_on_error.exp copy to unit-tests/deptgt-end-fail-indirect.exp index e2f6a429a9fc..17e509600617 100644 --- a/unit-tests/varname-make_print_var_on_error.exp +++ b/unit-tests/deptgt-end-fail-indirect.exp @@ -1,8 +1,7 @@ -fail +: all +false *** Error code 1 (continuing) Stop. make: stopped in unit-tests -.ERROR_TARGET='all' -.ERROR_CMD='' exit status 1 diff --git a/unit-tests/deptgt-end-fail-indirect.mk b/unit-tests/deptgt-end-fail-indirect.mk new file mode 100644 index 000000000000..29346b8321fe --- /dev/null +++ b/unit-tests/deptgt-end-fail-indirect.mk @@ -0,0 +1,16 @@ +# $NetBSD: deptgt-end-fail-indirect.mk,v 1.2 2020/12/06 21:22:04 rillig Exp $ +# +# Tests for an error in a dependency of the .END node. +# +# Before 2020-11-25, an error in the .END target did not print the "Stop." +# and exited with status 0. The cause for this was a missing condition in +# Compat_Run in the handling of the .END node. + +all: + : $@ + +.END: failing + : Making ${.TARGET} from ${.ALLSRC}. + +failing: .PHONY + false diff --git a/unit-tests/deptgt-end-fail.exp b/unit-tests/deptgt-end-fail.exp new file mode 100644 index 000000000000..9db907c209d5 --- /dev/null +++ b/unit-tests/deptgt-end-fail.exp @@ -0,0 +1,163 @@ +Test case all=ok all-dep=ok end=ok end-dep=ok. +: Making all-dep out of nothing. +: Making all from all-dep. +: Making end-dep out of nothing. +: Making .END from end-dep. +exit status 0 + + +Test case all=ok all-dep=ok end=ok end-dep=ERR. +: Making all-dep out of nothing. +: Making all from all-dep. +: Making end-dep out of nothing. +*** Error code 1 (continuing) + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ok all-dep=ok end=ERR end-dep=ok. +: Making all-dep out of nothing. +: Making all from all-dep. +: Making end-dep out of nothing. +: Making .END from end-dep. +*** Error code 1 (continuing) + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ok all-dep=ok end=ERR end-dep=ERR. +: Making all-dep out of nothing. +: Making all from all-dep. +: Making end-dep out of nothing. +*** Error code 1 (continuing) + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ok all-dep=ERR end=ok end-dep=ok. +: Making all-dep out of nothing. +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ok all-dep=ERR end=ok end-dep=ERR. +: Making all-dep out of nothing. +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ok all-dep=ERR end=ERR end-dep=ok. +: Making all-dep out of nothing. +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ok all-dep=ERR end=ERR end-dep=ERR. +: Making all-dep out of nothing. +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ERR all-dep=ok end=ok end-dep=ok. +: Making all-dep out of nothing. +: Making all from all-dep. +*** Error code 1 (continuing) + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ERR all-dep=ok end=ok end-dep=ERR. +: Making all-dep out of nothing. +: Making all from all-dep. +*** Error code 1 (continuing) + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ERR all-dep=ok end=ERR end-dep=ok. +: Making all-dep out of nothing. +: Making all from all-dep. +*** Error code 1 (continuing) + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ERR all-dep=ok end=ERR end-dep=ERR. +: Making all-dep out of nothing. +: Making all from all-dep. +*** Error code 1 (continuing) + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ERR all-dep=ERR end=ok end-dep=ok. +: Making all-dep out of nothing. +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ERR all-dep=ERR end=ok end-dep=ERR. +: Making all-dep out of nothing. +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ERR all-dep=ERR end=ERR end-dep=ok. +: Making all-dep out of nothing. +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 + + +Test case all=ERR all-dep=ERR end=ERR end-dep=ERR. +: Making all-dep out of nothing. +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 + + +exit status 0 diff --git a/unit-tests/deptgt-end-fail.mk b/unit-tests/deptgt-end-fail.mk new file mode 100644 index 000000000000..57cdc7da8679 --- /dev/null +++ b/unit-tests/deptgt-end-fail.mk @@ -0,0 +1,69 @@ +# $NetBSD: deptgt-end-fail.mk,v 1.6 2020/12/07 01:04:07 rillig Exp $ +# +# Tests for an errors in the main target, its dependencies, +# the .END node and its dependencies. +# +# Before 2020-11-25, an error in the .END target did not print the "Stop.", +# even though this was intended. The cause for this was a missing condition +# in Compat_Run, in the code handling the .END node. + +test: .PHONY + +# The default stop-on-error mode is not as interesting to test since it +# stops right after the first error. +.MAKEFLAGS: -k + +.for all in ok ERR +. for all-dep in ok ERR +. for end in ok ERR +. for end-dep in ok ERR +. for target in ${all}-${all-dep}-${end}-${end-dep} +test: ${target} +${target}: .PHONY .SILENT + echo Test case all=${all} all-dep=${all-dep} end=${end} end-dep=${end-dep}. + ${MAKE} -r -f ${MAKEFILE} \ + all=${all} all-dep=${all-dep} \ + end=${end} end-dep=${end-dep} \ + all; \ + echo "exit status $$?" + echo + echo +. endfor +. endfor +. endfor +. endfor +.endfor + +.if make(all) + +all all-dep end-dep: .PHONY + +CMD.ok= true +CMD.ERR= false + +all: all-dep + : Making ${.TARGET} from ${.ALLSRC}. + @${CMD.${all}} + +all-dep: + : Making ${.TARGET} out of nothing. + @${CMD.${all-dep}} + +.END: end-dep + : Making ${.TARGET} from ${.ALLSRC}. + @${CMD.${end}} + +end-dep: + : Making ${.TARGET} out of nothing. + @${CMD.${end-dep}} + +.endif + +# Until 2020-12-07, several of the test cases printed "`all' not remade +# because of errors.", followed by "exit status 0", which contradicted +# each other. + +# Until 2020-12-07, '.END' was even made if 'all' failed, but if a dependency +# of 'all' failed, it was skipped. This inconsistency was not needed for +# anything and thus has been dropped. To run some commands on error, use the +# .ERROR target instead, see deptgt-error.mk. diff --git a/unit-tests/deptgt-suffixes.exp b/unit-tests/deptgt-suffixes.exp index 65dc36cfe001..512e6d44a8be 100644 --- a/unit-tests/deptgt-suffixes.exp +++ b/unit-tests/deptgt-suffixes.exp @@ -1,7 +1,33 @@ #*** Suffixes: # ".custom-null" (num 1, ref 1) (SUFF_NULL) # To: # From: # Search Path: . .. +# ".src-left" (num 2, ref 2) +# To: .tgt-right +# From: +# Search Path: +# ".tgt-right" (num 3, ref 2) +# To: +# From: .src-left +# Search Path: +# ".tgt-left" (num 4, ref 2) +# To: +# From: .src-right +# Search Path: +# ".src-right" (num 5, ref 2) +# To: .tgt-left +# From: +# Search Path: #*** Transformations: +.src-left.tgt-right: + : Making ${.TARGET} from ${.IMPSRC}. + +.src-right.tgt-left: + : Making ${.TARGET} from ${.IMPSRC}. + +: Making deptgt-suffixes.src-left out of nothing. +: Making deptgt-suffixes.tgt-right from deptgt-suffixes.src-left. +: Making deptgt-suffixes.src-right out of nothing. +: Making deptgt-suffixes.tgt-left from deptgt-suffixes.src-right. exit status 0 diff --git a/unit-tests/deptgt-suffixes.mk b/unit-tests/deptgt-suffixes.mk index 791ff5eb5f03..15b4dc08161c 100644 --- a/unit-tests/deptgt-suffixes.mk +++ b/unit-tests/deptgt-suffixes.mk @@ -1,18 +1,35 @@ -# $NetBSD: deptgt-suffixes.mk,v 1.3 2020/08/28 04:05:35 rillig Exp $ +# $NetBSD: deptgt-suffixes.mk,v 1.4 2020/11/21 21:54:42 rillig Exp $ # # Tests for the special target .SUFFIXES in dependency declarations. # # See also: # varname-dot-includes.mk # varname-dot-libs.mk .MAKEFLAGS: -dg1 +.MAIN: all + .SUFFIXES: .custom-null # TODO: What is the effect of this? How is it useful? .NULL: .custom-null .PATH.custom-null: . .. -all: - @:; +# The order in which the suffixes are listed doesn't matter. +# Here, they are listed from source to target, just like in the transformation +# rule below it. +.SUFFIXES: .src-left .tgt-right +deptgt-suffixes.src-left: + : Making ${.TARGET} out of nothing. +.src-left.tgt-right: + : Making ${.TARGET} from ${.IMPSRC}. +all: deptgt-suffixes.tgt-right + +# Here, the target is listed earlier than the source. +.SUFFIXES: .tgt-left .src-right +deptgt-suffixes.src-right: + : Making ${.TARGET} out of nothing. +.src-right.tgt-left: + : Making ${.TARGET} from ${.IMPSRC}. +all: deptgt-suffixes.tgt-left diff --git a/unit-tests/deptgt.exp b/unit-tests/deptgt.exp index fee0563f5b37..b2aeaa5a2850 100644 --- a/unit-tests/deptgt.exp +++ b/unit-tests/deptgt.exp @@ -1,13 +1,14 @@ make: "deptgt.mk" line 10: warning: Extra target ignored make: "deptgt.mk" line 28: Unassociated shell command ": command3 # parse error, since targets == NULL" ParseReadLine (34): '${:U}: empty-source' ParseDoDependency(: empty-source) ParseReadLine (35): ' : command for empty targets list' ParseReadLine (36): ': empty-source' ParseDoDependency(: empty-source) ParseReadLine (37): ' : command for empty targets list' ParseReadLine (38): '.MAKEFLAGS: -d0' ParseDoDependency(.MAKEFLAGS: -d0) +make: "deptgt.mk" line 46: Unknown modifier 'Z' make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/deptgt.mk b/unit-tests/deptgt.mk index 83f81b6f58ed..09f381715e6d 100644 --- a/unit-tests/deptgt.mk +++ b/unit-tests/deptgt.mk @@ -1,41 +1,49 @@ -# $NetBSD: deptgt.mk,v 1.9 2020/11/15 11:57:00 rillig Exp $ +# $NetBSD: deptgt.mk,v 1.10 2020/12/27 18:20:26 rillig Exp $ # # Tests for special targets like .BEGIN or .SUFFIXES in dependency # declarations. # TODO: Implementation # Just in case anyone tries to compile several special targets in a single # dependency line: That doesn't work, and make immediately rejects it. .SUFFIXES .PHONY: .c.o # The following lines demonstrate how 'targets' is set and reset during # parsing of dependencies. To see it in action, set breakpoints in: # # ParseDoDependency at the beginning # FinishDependencyGroup at "targets = NULL" # Parse_File at "Lst_Free(targets)" # Parse_File at "targets = Lst_New()" # ParseLine_ShellCommand at "targets == NULL" # # Keywords: # parse.c:targets target1 target2: sources # targets := [target1, target2] : command1 # targets == [target1, target2] : command2 # targets == [target1, target2] VAR=value # targets := NULL : command3 # parse error, since targets == NULL # In a dependency declaration, the list of targets can be empty. # It doesn't matter whether the empty string is generated by a variable # expression or whether it is just omitted. .MAKEFLAGS: -dp ${:U}: empty-source : command for empty targets list : empty-source : command for empty targets list .MAKEFLAGS: -d0 +# Just to show that a malformed expression is only expanded once in +# ParseDependencyTargetWord. The only way to produce an expression that +# is well-formed on the first expansion and ill-formed on the second +# expansion would be to use the variable modifier '::=' to modify the +# targets. This in turn would be such an extreme and unreliable edge case +# that nobody uses it. +$$$$$$$${:U:Z}: + all: @:; diff --git a/unit-tests/directive-elif.exp b/unit-tests/directive-elif.exp index 6219b4896795..6856494023d7 100644 --- a/unit-tests/directive-elif.exp +++ b/unit-tests/directive-elif.exp @@ -1,17 +1,21 @@ -make: "directive-elif.mk" line 7: begin .elif misspellings tests, part 1 -make: "directive-elif.mk" line 9: 1-then -make: "directive-elif.mk" line 18: begin .elif misspellings tests, part 2 -make: "directive-elif.mk" line 29: begin .elif misspellings tests, part 3 -make: "directive-elif.mk" line 41: which branch is taken on misspelling after false? -make: "directive-elif.mk" line 49: else -make: "directive-elif.mk" line 52: which branch is taken on misspelling after true? -make: "directive-elif.mk" line 54: 1-then -make: "directive-elif.mk" line 55: Unknown directive "elsif" -make: "directive-elif.mk" line 56: 1-elsif -make: "directive-elif.mk" line 57: Unknown directive "elsif" -make: "directive-elif.mk" line 58: 2-elsif -make: "directive-elif.mk" line 64: if-less elif -make: "directive-elif.mk" line 69: warning: extra elif +make: "directive-elif.mk" line 47: Unknown directive "elsif" +make: "directive-elif.mk" line 52: This branch is taken. +make: "directive-elif.mk" line 60: Unknown directive "elsif" +make: "directive-elif.mk" line 63: This branch is taken. +make: "directive-elif.mk" line 69: This branch is taken. +make: "directive-elif.mk" line 89: Unknown directive "elsif" +make: "directive-elif.mk" line 90: This misspelling is detected. +make: "directive-elif.mk" line 91: This branch is taken because of the .else. +make: "directive-elif.mk" line 109: What happens on misspelling in a skipped branch? +make: "directive-elif.mk" line 119: else +make: "directive-elif.mk" line 122: What happens on misspelling in a taken branch? +make: "directive-elif.mk" line 124: 1-then +make: "directive-elif.mk" line 125: Unknown directive "elsif" +make: "directive-elif.mk" line 126: 1-elsif +make: "directive-elif.mk" line 127: Unknown directive "elsif" +make: "directive-elif.mk" line 128: 2-elsif +make: "directive-elif.mk" line 134: if-less elif +make: "directive-elif.mk" line 139: warning: extra elif make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/directive-elif.mk b/unit-tests/directive-elif.mk index f9a43abfffc1..e7b89beec4e9 100644 --- a/unit-tests/directive-elif.mk +++ b/unit-tests/directive-elif.mk @@ -1,72 +1,142 @@ -# $NetBSD: directive-elif.mk,v 1.6 2020/11/12 19:46:36 rillig Exp $ +# $NetBSD: directive-elif.mk,v 1.7 2020/12/19 19:49:01 rillig Exp $ # # Tests for the .elif directive. +# +# Misspellings of the .elif directive are not always detected. They are only +# detected if the conditional branch directly above it is taken. In all other +# cases, make skips over the skipped branch as fast as possible, looking only +# at the initial '.' of the line and whether the directive is one of the known +# conditional directives. All other directives are silently ignored, as they +# could be variable assignments or dependency declarations as well, and +# deciding this would cost time. + # TODO: Implementation -.info begin .elif misspellings tests, part 1 -.if 1 -. info 1-then -.elif 1 # ok -. info 1-elif -.elsif 1 # oops: misspelled -. info 1-elsif -.elseif 1 # oops: misspelled -. info 1-elseif + +# Misspelling '.elsif' below an .if branch that is not taken. +.if 0 +. info This branch is not taken. +# As of 2020-12-19, the misspelling is not recognized as a conditional +# directive and is thus silently skipped. +# +# Since the .if condition evaluated to false, this whole branch is not taken. +.elsif 0 +. info XXX: This misspelling is not detected. +. info This branch is not taken. +# Even if the misspelling were detected, the branch would not be taken +# since the condition of the '.elsif' evaluates to false as well. .endif -.info begin .elif misspellings tests, part 2 + +# Misspelling '.elsif' below an .if branch that is not taken. .if 0 -. info 0-then -.elif 0 # ok -. info 0-elif -.elsif 0 # oops: misspelled -. info 0-elsif -.elseif 0 # oops: misspelled -. info 0-elseif +. info This branch is not taken. +# As of 2020-12-19, the misspelling is not recognized as a conditional +# directive and is thus silently skipped. Since the .if condition evaluated +# to false, this whole branch is not taken. +.elsif 1 +. info XXX: This misspelling is not detected. +# If the misspelling were detected, this branch would be taken. +.endif + + +# Misspelling '.elsif' below an .if branch that is taken. +.if 1 +# This misspelling is in an active branch and is therefore detected. +.elsif 0 +# The only thing that make detects here is a misspelled directive, make +# doesn't recognize that it was meant to be a conditional directive. +# Therefore the branch continues here, even though the '.elsif' condition +# evaluates to false. +. info This branch is taken. +.endif + + +# Misspelling '.elsif' below an .if branch that is taken. +.if 1 +# As of 2020-12-19, the misspelling is in an active branch and is therefore +# detected. +.elsif 1 +# Since both conditions evaluate to true, this branch is taken no matter +# whether make detects a misspelling or not. +. info This branch is taken. .endif -.info begin .elif misspellings tests, part 3 + +# Misspelling '.elsif' in a skipped branch below a branch that was taken. +.if 1 +. info This branch is taken. +.elif 0 +. info This branch is not taken. +.elsif 1 +. info XXX: This misspelling is not detected. +.endif + + +# Misspelling '.elsif' in an .else branch that is not taken. +.if 1 +.else +. info This branch is not taken. +.elsif 1 +. info XXX: This misspelling is not detected. +.endif + + +# Misspelling '.elsif' in an .else branch that is taken. .if 0 -. info 0-then -.elsif 0 # oops: misspelled -. info 0-elsif +.else +.elsif 1 +. info This misspelling is detected. +. info This branch is taken because of the .else. .endif + + +# Misspellings for .elif in a .elif branch that is not taken. .if 0 -. info 0-then -.elseif 0 # oops: misspelled -. info 0-elseif +. info This branch is not taken. +.elif 0 # ok +. info This branch is not taken. +.elsif 0 +. info XXX: This misspelling is not detected. +. info This branch is not taken. +.elseif 0 +. info XXX: This misspelling is not detected. +. info This branch is not taken. .endif -.info which branch is taken on misspelling after false? + +.info What happens on misspelling in a skipped branch? .if 0 . info 0-then .elsif 1 +. info XXX: This misspelling is not detected. . info 1-elsif .elsif 2 +. info XXX: This misspelling is not detected. . info 2-elsif .else . info else .endif -.info which branch is taken on misspelling after true? +.info What happens on misspelling in a taken branch? .if 1 . info 1-then .elsif 1 . info 1-elsif .elsif 2 . info 2-elsif .else . info else .endif # Expect: "if-less elif" .elif 0 .if 1 .else -# Expect: "warning: if-less elif" +# Expect: "warning: extra elif" .elif .endif all: diff --git a/unit-tests/directive-else.exp b/unit-tests/directive-else.exp index ca60595745a9..138e893ffa88 100644 --- a/unit-tests/directive-else.exp +++ b/unit-tests/directive-else.exp @@ -1,11 +1,11 @@ -make: "directive-else.mk" line 11: The .else directive does not take arguments. -make: "directive-else.mk" line 12: ok -make: "directive-else.mk" line 16: ok -make: "directive-else.mk" line 17: The .else directive does not take arguments. -make: "directive-else.mk" line 22: if-less else -make: "directive-else.mk" line 28: ok -make: "directive-else.mk" line 29: warning: extra else -make: "directive-else.mk" line 42: The .else directive does not take arguments. +make: "directive-else.mk" line 14: The .else directive does not take arguments. +make: "directive-else.mk" line 15: ok +make: "directive-else.mk" line 19: ok +make: "directive-else.mk" line 21: The .else directive does not take arguments. +make: "directive-else.mk" line 26: if-less else +make: "directive-else.mk" line 32: ok +make: "directive-else.mk" line 33: warning: extra else +make: "directive-else.mk" line 45: The .else directive does not take arguments. make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/directive-else.mk b/unit-tests/directive-else.mk index fdd94007a1fa..794057110ef7 100644 --- a/unit-tests/directive-else.mk +++ b/unit-tests/directive-else.mk @@ -1,46 +1,49 @@ -# $NetBSD: directive-else.mk,v 1.6 2020/11/13 09:01:59 rillig Exp $ +# $NetBSD: directive-else.mk,v 1.7 2020/12/14 22:17:11 rillig Exp $ # # Tests for the .else directive. +# +# Since 2020-11-13, an '.else' followed by extraneous text generates a parse +# error in -dL (lint) mode. +# +# Since 2020-12-15, an '.else' followed by extraneous text always generates +# a parse error. -.MAKEFLAGS: -dL # To enable the check for ".else " - -# The .else directive does not take any arguments. -# As of 2020-08-29, make doesn't warn about this. .if 0 . warning must not be reached +# The .else directive does not take any arguments. .else 123 . info ok .endif .if 1 . info ok +# The .else directive does not take any arguments. .else 123 . warning must not be reached .endif # An .else without a corresponding .if is an error. .else # Accidental extra .else directives are detected too. .if 0 . warning must not be reached .else . info ok .else . info After an extra .else, everything is skipped. .endif # An .else may have a comment. This comment does not count as an argument, # therefore no parse error. .if 0 .else # comment .endif # A variable expression does count as an argument, even if it is empty. -# XXX: This should be a parse error. .if 0 .else ${:U} .endif all: @:; diff --git a/unit-tests/directive-undef.exp b/unit-tests/directive-endfor.exp similarity index 60% copy from unit-tests/directive-undef.exp copy to unit-tests/directive-endfor.exp index 303d5a3e2a27..7e243a8f67e6 100644 --- a/unit-tests/directive-undef.exp +++ b/unit-tests/directive-endfor.exp @@ -1,4 +1,4 @@ -make: "directive-undef.mk" line 16: Unknown directive "unde" +make: "directive-endfor.mk" line 9: for-less endfor make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/directive-endfor.mk b/unit-tests/directive-endfor.mk new file mode 100644 index 000000000000..b0c37f388504 --- /dev/null +++ b/unit-tests/directive-endfor.mk @@ -0,0 +1,9 @@ +# $NetBSD: directive-endfor.mk,v 1.1 2020/12/30 14:50:08 rillig Exp $ +# +# Test for the directive .endfor, which ends a .for loop. +# +# See also: +# directive-for.mk + +# An .endfor without a corresponding .for is a parse error. +.endfor diff --git a/unit-tests/directive-endif.exp b/unit-tests/directive-endif.exp index 39a9383953dd..286d85244eae 100644 --- a/unit-tests/directive-endif.exp +++ b/unit-tests/directive-endif.exp @@ -1 +1,8 @@ -exit status 0 +make: "directive-endif.mk" line 18: The .endif directive does not take arguments. +make: "directive-endif.mk" line 23: The .endif directive does not take arguments. +make: "directive-endif.mk" line 33: The .endif directive does not take arguments. +make: "directive-endif.mk" line 39: The .endif directive does not take arguments. +make: "directive-endif.mk" line 45: Unknown directive "endifx" +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/directive-endif.mk b/unit-tests/directive-endif.mk index b0b531af2f06..10dd6ce22ce8 100644 --- a/unit-tests/directive-endif.mk +++ b/unit-tests/directive-endif.mk @@ -1,27 +1,49 @@ -# $NetBSD: directive-endif.mk,v 1.3 2020/11/12 22:40:11 rillig Exp $ +# $NetBSD: directive-endif.mk,v 1.5 2020/12/14 21:56:17 rillig Exp $ # # Tests for the .endif directive. # +# Since 2020-12-15, the .endif directive no longer accepts arguments. +# The manual page had never allowed that, but the code didn't check it. +# # See also: # Cond_EvalLine # TODO: Implementation .MAKEFLAGS: -dL # Error: .endif does not take arguments -# XXX: Missing error message .if 0 +# Since 2020-12-15, complain about the extra text after the 'endif'. .endif 0 # Error: .endif does not take arguments -# XXX: Missing error message .if 1 +# Since 2020-12-15, complain about the extra text after the 'endif'. .endif 1 # Comments are allowed after an '.endif'. .if 2 .endif # comment +# Only whitespace and comments are allowed after an '.endif', but nothing +# else. +.if 1 +# Since 2020-12-15, complain about the extra text after the 'endif'. +.endif0 + +# Only whitespace and comments are allowed after an '.endif', but nothing +# else. +.if 1 +# Since 2020-12-15, complain about the extra text after the 'endif'. +.endif/ + +# After an '.endif', no other letter must occur. This 'endifx' is not +# parsed as an 'endif', therefore another '.endif' must follow to balance +# the directives. +.if 1 +.endifx +.endif # to close the preceding '.if' + all: @:; diff --git a/unit-tests/directive-error.mk b/unit-tests/directive-error.mk index 3980016221ab..50a0c6c0e84c 100644 --- a/unit-tests/directive-error.mk +++ b/unit-tests/directive-error.mk @@ -1,8 +1,10 @@ -# $NetBSD: directive-error.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: directive-error.mk,v 1.3 2020/12/13 01:07:54 rillig Exp $ # -# Tests for the .error directive. +# Tests for the .error directive, which prints an error message and exits +# immediately, unlike other "fatal" parse errors, which continue to parse +# until the end of the current top-level makefile. # TODO: Implementation all: @:; diff --git a/unit-tests/directive-export-env.mk b/unit-tests/directive-export-env.mk index 82b5e8087c6d..2ef2ceaf788c 100644 --- a/unit-tests/directive-export-env.mk +++ b/unit-tests/directive-export-env.mk @@ -1,12 +1,10 @@ -# $NetBSD: directive-export-env.mk,v 1.3 2020/11/03 17:17:31 rillig Exp $ +# $NetBSD: directive-export-env.mk,v 1.4 2020/12/13 01:07:54 rillig Exp $ # # Tests for the .export-env directive. # TODO: Implementation -.export-en # oops: misspelled .export-env -.export-environment # oops: misspelled all: @:; diff --git a/unit-tests/directive-export-impl.exp b/unit-tests/directive-export-impl.exp new file mode 100644 index 000000000000..c3ac940d2df0 --- /dev/null +++ b/unit-tests/directive-export-impl.exp @@ -0,0 +1,56 @@ +ParseReadLine (21): 'UT_VAR= <${REF}>' +Global:UT_VAR = <${REF}> +ParseReadLine (28): '.export UT_VAR' +Global:.MAKE.EXPORTED = UT_VAR +ParseReadLine (32): ': ${UT_VAR:N*}' +Var_Parse: ${UT_VAR:N*} with VARE_UNDEFERR|VARE_WANTRES +Var_Parse: ${REF}> with VARE_UNDEFERR|VARE_WANTRES +Applying ${UT_VAR:N...} to "<>" (VARE_UNDEFERR|VARE_WANTRES, VAR_EXPORTED|VAR_REEXPORT, none) +Pattern[UT_VAR] for [<>] is [*] +ModifyWords: split "<>" into 1 words +Result of ${UT_VAR:N*} is "" (VARE_UNDEFERR|VARE_WANTRES, VAR_EXPORTED|VAR_REEXPORT, none) +ParseDoDependency(: ) +CondParser_Eval: ${:!echo "\$UT_VAR"!} != "<>" +Var_Parse: ${:!echo "\$UT_VAR"!} != "<>" with VARE_UNDEFERR|VARE_WANTRES +Applying ${:!...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF) +Modifier part: "echo "$UT_VAR"" +Var_Parse: ${.MAKE.EXPORTED:O:u} with VARE_WANTRES +Applying ${.MAKE.EXPORTED:O} to "UT_VAR" (VARE_WANTRES, none, none) +Result of ${.MAKE.EXPORTED:O} is "UT_VAR" (VARE_WANTRES, none, none) +Applying ${.MAKE.EXPORTED:u} to "UT_VAR" (VARE_WANTRES, none, none) +Result of ${.MAKE.EXPORTED:u} is "UT_VAR" (VARE_WANTRES, none, none) +Var_Parse: ${UT_VAR} with VARE_WANTRES +Var_Parse: ${REF}> with VARE_WANTRES +Result of ${:!echo "\$UT_VAR"!} is "<>" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) +lhs = "<>", rhs = "<>", op = != +ParseReadLine (49): ': ${UT_VAR:N*}' +Var_Parse: ${UT_VAR:N*} with VARE_UNDEFERR|VARE_WANTRES +Var_Parse: ${REF}> with VARE_UNDEFERR|VARE_WANTRES +Applying ${UT_VAR:N...} to "<>" (VARE_UNDEFERR|VARE_WANTRES, VAR_EXPORTED|VAR_REEXPORT, none) +Pattern[UT_VAR] for [<>] is [*] +ModifyWords: split "<>" into 1 words +Result of ${UT_VAR:N*} is "" (VARE_UNDEFERR|VARE_WANTRES, VAR_EXPORTED|VAR_REEXPORT, none) +ParseDoDependency(: ) +ParseReadLine (53): 'REF= defined' +Global:REF = defined +CondParser_Eval: ${:!echo "\$UT_VAR"!} != "" +Var_Parse: ${:!echo "\$UT_VAR"!} != "" with VARE_UNDEFERR|VARE_WANTRES +Applying ${:!...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF) +Modifier part: "echo "$UT_VAR"" +Var_Parse: ${.MAKE.EXPORTED:O:u} with VARE_WANTRES +Applying ${.MAKE.EXPORTED:O} to "UT_VAR" (VARE_WANTRES, none, none) +Result of ${.MAKE.EXPORTED:O} is "UT_VAR" (VARE_WANTRES, none, none) +Applying ${.MAKE.EXPORTED:u} to "UT_VAR" (VARE_WANTRES, none, none) +Result of ${.MAKE.EXPORTED:u} is "UT_VAR" (VARE_WANTRES, none, none) +Var_Parse: ${UT_VAR} with VARE_WANTRES +Var_Parse: ${REF}> with VARE_WANTRES +Result of ${:!echo "\$UT_VAR"!} is "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) +lhs = "", rhs = "", op = != +ParseReadLine (61): 'all:' +ParseDoDependency(all:) +Global:.ALLTARGETS = all +ParseReadLine (62): '.MAKEFLAGS: -d0' +ParseDoDependency(.MAKEFLAGS: -d0) +Global:.MAKEFLAGS = -r -k -d cpv -d +Global:.MAKEFLAGS = -r -k -d cpv -d 0 +exit status 0 diff --git a/unit-tests/directive-export-impl.mk b/unit-tests/directive-export-impl.mk new file mode 100644 index 000000000000..556e5352d1c3 --- /dev/null +++ b/unit-tests/directive-export-impl.mk @@ -0,0 +1,62 @@ +# $NetBSD: directive-export-impl.mk,v 1.1 2020/12/29 01:45:06 rillig Exp $ +# +# Test for the implementation of exporting variables to child processes. +# This involves marking variables for export, actually exporting them, +# or marking them for being re-exported. +# +# See also: +# Var_Export +# ExportVar +# VarExportedMode (global) +# VAR_EXPORTED (per variable) +# VAR_REEXPORT (per variable) +# VarExportMode (per call of Var_Export and ExportVar) + +: ${:U:sh} # side effect: initialize .SHELL + +.MAKEFLAGS: -dcpv + +# This is a variable that references another variable. At this point, the +# other variable is still undefined. +UT_VAR= <${REF}> + +# At this point, ExportVar("UT_VAR", VEM_PLAIN) is called. Since the +# variable value refers to another variable, ExportVar does not actually +# export the variable but only marks it as VAR_EXPORTED and VAR_REEXPORT. +# After that, ExportVars registers the variable name in .MAKE.EXPORTED. +# That's all for now. +.export UT_VAR + +# Evaluating this expression shows the variable flags in the debug log, +# which are VAR_EXPORTED|VAR_REEXPORT. +: ${UT_VAR:N*} + +# At the last moment before actually forking off the child process for the +# :!...! modifier, Cmd_Exec calls Var_ReexportVars to have all relevant +# variables exported. Since this variable has both of the above-mentioned +# flags set, it is actually exported to the environment. The variable flags +# are not modified though, since the next time the :!...! modifier is +# evaluated, the referenced variables could have changed, therefore the +# variable will be exported anew for each ':sh' modifier, ':!...!' modifier, +# '!=' variable assignment. +.if ${:!echo "\$UT_VAR"!} != "<>" +. error +.endif + +# Evaluating this expression shows the variable flags in the debug log, +# which are still VAR_EXPORTED|VAR_REEXPORT, which means that the variable +# is still marked as being re-exported for each child process. +: ${UT_VAR:N*} + +# Now the referenced variable gets defined. This does not influence anything +# in the process of exporting the variable value, though. +REF= defined + +# Nothing surprising here. The variable UT_VAR gets exported, and this time, +# REF is defined and gets expanded into the exported environment variable. +.if ${:!echo "\$UT_VAR"!} != "" +. error +.endif + +all: +.MAKEFLAGS: -d0 diff --git a/unit-tests/directive-export-literal.mk b/unit-tests/directive-export-literal.mk index 51e5b522a3b9..5fafa4a7282d 100644 --- a/unit-tests/directive-export-literal.mk +++ b/unit-tests/directive-export-literal.mk @@ -1,15 +1,13 @@ -# $NetBSD: directive-export-literal.mk,v 1.6 2020/11/03 17:17:31 rillig Exp $ +# $NetBSD: directive-export-literal.mk,v 1.7 2020/12/13 01:07:54 rillig Exp $ # # Tests for the .export-literal directive, which exports a variable value # without expanding it. UT_VAR= value with ${UNEXPANDED} expression .export-literal UT_VAR -.export-litera # oops: misspelled .export-literal # oops: missing argument -.export-literally # oops: misspelled all: @echo "$$UT_VAR" diff --git a/unit-tests/directive-export.exp b/unit-tests/directive-export.exp index bd828b63c10c..39a9383953dd 100644 --- a/unit-tests/directive-export.exp +++ b/unit-tests/directive-export.exp @@ -1,4 +1 @@ -make: "directive-export.mk" line 25: Unknown directive "expor" -make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests -exit status 1 +exit status 0 diff --git a/unit-tests/directive-export.mk b/unit-tests/directive-export.mk index bae50aecbdaf..40fda0968cb0 100644 --- a/unit-tests/directive-export.mk +++ b/unit-tests/directive-export.mk @@ -1,31 +1,35 @@ -# $NetBSD: directive-export.mk,v 1.4 2020/11/03 17:17:31 rillig Exp $ +# $NetBSD: directive-export.mk,v 1.6 2020/12/13 01:07:54 rillig Exp $ # # Tests for the .export directive. +# +# See also: +# directive-misspellings.mk # TODO: Implementation INDIRECT= indirect VAR= value $$ ${INDIRECT} +# Before 2020-12-13, this unusual expression invoked undefined behavior since +# it accessed out-of-bounds memory via Var_Export -> ExportVar -> MayExport. +.export ${:U } + # A variable is exported using the .export directive. # During that, its value is expanded, just like almost everywhere else. .export VAR .if ${:!env | grep '^VAR'!} != "VAR=value \$ indirect" . error .endif # Undefining a variable that has been exported implicitly removes it from # the environment of all child processes. .undef VAR .if ${:!env | grep '^VAR' || true!} != "" . error .endif -# Tests for parsing the .export directive. -.expor # misspelled -.export # oops: missing argument -.export VARNAME -.exporting works # oops: misspelled +# No argument means to export all variables. +.export all: @:; diff --git a/unit-tests/directive-for-errors.exp b/unit-tests/directive-for-errors.exp new file mode 100644 index 000000000000..6088a93c9a4a --- /dev/null +++ b/unit-tests/directive-for-errors.exp @@ -0,0 +1,22 @@ +make: "directive-for-errors.mk" line 7: Unknown directive "fori" +make: "directive-for-errors.mk" line 8: warning: +make: "directive-for-errors.mk" line 9: for-less endfor +make: "directive-for-errors.mk" line 19: Unknown directive "for" +make: "directive-for-errors.mk" line 20: warning: +make: "directive-for-errors.mk" line 21: for-less endfor +make: "directive-for-errors.mk" line 37: Dollar $ 1 1 and backslash 2 2 2. +make: "directive-for-errors.mk" line 37: Dollar $ 3 3 and backslash 4 4 4. +make: "directive-for-errors.mk" line 43: no iteration variables in for +make: "directive-for-errors.mk" line 47: warning: Should not be reached. +make: "directive-for-errors.mk" line 48: for-less endfor +make: "directive-for-errors.mk" line 53: Wrong number of words (5) in .for substitution list with 3 variables +make: "directive-for-errors.mk" line 64: missing `in' in for +make: "directive-for-errors.mk" line 66: warning: Should not be reached. +make: "directive-for-errors.mk" line 67: for-less endfor +make: "directive-for-errors.mk" line 73: Unknown modifier 'Z' +make: "directive-for-errors.mk" line 74: warning: Should not be reached. +make: "directive-for-errors.mk" line 74: warning: Should not be reached. +make: "directive-for-errors.mk" line 74: warning: Should not be reached. +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/directive-for-errors.mk b/unit-tests/directive-for-errors.mk new file mode 100644 index 000000000000..7890e2375af4 --- /dev/null +++ b/unit-tests/directive-for-errors.mk @@ -0,0 +1,75 @@ +# $NetBSD: directive-for-errors.mk,v 1.1 2020/12/31 03:05:12 rillig Exp $ +# +# Tests for error handling in .for loops. + +# A .for directive must be followed by whitespace, everything else results +# in a parse error. +.fori in 1 2 3 +. warning ${i} +.endfor + +# A slash is not whitespace, therefore this is not parsed as a .for loop. +# +# XXX: The error message is misleading though. As of 2020-12-31, it says +# "Unknown directive "for"", but that directive is actually known. This is +# because ForEval does not detect the .for loop as such, so parsing +# continues in ParseLine > ParseDependency > ParseDoDependency > +# ParseDoDependencyTargets > ParseErrorNoDependency, and there the directive +# name is parsed a bit differently. +.for/i in 1 2 3 +. warning ${i} +.endfor + +# As of 2020-12-31, the variable name can be an arbitrary word, it just needs +# to be separated by whitespace. Even '$' and '\' are valid variable names, +# which is not useful in practice. +# +# The '$$' is not replaced with the values '1' or '3' from the .for loop, +# instead it is kept as-is, and when the .info directive expands its argument, +# each '$$' gets replaced with a single '$'. The "long variable expression" +# ${$} gets replaced though, even though this would be a parse error everywhere +# outside a .for loop. +# +# The '\' on the other hand is treated as a normal variable name. +${:U\$}= dollar # see whether the "variable" '$' is local +${:U\\}= backslash # see whether the "variable" '\' is local +.for $ \ in 1 2 3 4 +. info Dollar $$ ${$} $($) and backslash $\ ${\} $(\). +.endfor + +# If there are no variables, there is no point in expanding the .for loop +# since this would end up in an endless loop, each time consuming 0 of the +# 3 values. +.for in 1 2 3 +# XXX: This should not be reached. It should be skipped, as already done +# when the number of values is not a multiple of the number of variables, +# see below. +. warning Should not be reached. +.endfor + +# There are 3 variables and 5 values. These 5 values cannot be split evenly +# among the variables, therefore the loop is not expanded at all, it is +# rather skipped. +.for a b c in 1 2 3 4 5 +. warning Should not be reached. +.endfor + +# The list of values after the 'in' may be empty, no matter if this emptiness +# comes from an empty expansion or even from a syntactically empty line. +.for i in +. info Would be reached if there were items to loop over. +.endfor + +# A missing 'in' should parse the .for loop but skip the body. +.for i : k +# XXX: As of 2020-12-31, this line is reached once. +. warning Should not be reached. +.endfor + +# A malformed modifier should be detected and skip the body of the loop. +# +# XXX: As of 2020-12-31, Var_Subst doesn't report any errors, therefore +# the loop body is expanded as if no error had happened. +.for i in 1 2 ${:U3:Z} 4 +. warning Should not be reached. +.endfor diff --git a/unit-tests/directive-for-escape.exp b/unit-tests/directive-for-escape.exp new file mode 100644 index 000000000000..3d2d2ec744aa --- /dev/null +++ b/unit-tests/directive-for-escape.exp @@ -0,0 +1,74 @@ +For: end for 1 +For: loop body: +. info ${:U!"#$%&'()*+,-./0-9\:;<=>?@A-Z[\\]_^a-z{|\}~} +make: Unclosed variable specification (expecting '}') for "" (value "!"") modifier U +make: "directive-for-escape.mk" line 19: !" +For: end for 1 +For: loop body: +. info ${:U!"\\\\#$%&'()*+,-./0-9\:;<=>?@A-Z[\\]_^a-z{|\}~} +make: Unclosed variable specification (expecting '}') for "" (value "!"\\") modifier U +make: "directive-for-escape.mk" line 29: !"\\ +For: end for 1 +For: loop body: +. info ${:U\$} +make: "directive-for-escape.mk" line 41: $ +For: loop body: +. info ${:U${V}} +make: "directive-for-escape.mk" line 41: value +For: loop body: +. info ${:U${V:=-with-modifier}} +make: "directive-for-escape.mk" line 41: value-with-modifier +For: loop body: +. info ${:U$(V)} +make: "directive-for-escape.mk" line 41: value +For: loop body: +. info ${:U$(V:=-with-modifier)} +make: "directive-for-escape.mk" line 41: value-with-modifier +For: end for 1 +For: loop body: +. info ${:U\${UNDEF\:U\\$\\$} +make: "directive-for-escape.mk" line 52: ${UNDEF:U\$ +For: loop body: +. info ${:U{{\}\}} +make: "directive-for-escape.mk" line 52: {{}} +For: loop body: +. info ${:Uend\}} +make: "directive-for-escape.mk" line 52: end} +For: end for 1 +For: loop body: +. info ${:U\$} +make: "directive-for-escape.mk" line 60: $ +For: end for 1 +For: loop body: +. info ${NUMBERS} ${:Ureplaced} +make: "directive-for-escape.mk" line 68: one two three replaced +For: end for 1 +For: loop body: +. info ${:Ureplaced} +make: "directive-for-escape.mk" line 78: replaced +For: end for 1 +For: loop body: +. info . $$i: ${:Uinner} +. info . $${i}: ${:Uinner} +. info . $${i:M*}: ${:Uinner:M*} +. info . $$(i): $(:Uinner) +. info . $$(i:M*): $(:Uinner:M*) +. info . $${i$${:U}}: ${i${:U}} +. info . $${i\}}: ${:Uinner\}} # XXX: unclear why SubstVarLong needs this +. info . $${i2}: ${i2} +. info . $${i,}: ${i,} +. info . adjacent: ${:Uinner}${:Uinner}${:Uinner:M*}${:Uinner} +make: "directive-for-escape.mk" line 86: . $i: inner +make: "directive-for-escape.mk" line 87: . ${i}: inner +make: "directive-for-escape.mk" line 88: . ${i:M*}: inner +make: "directive-for-escape.mk" line 89: . $(i): inner +make: "directive-for-escape.mk" line 90: . $(i:M*): inner +make: "directive-for-escape.mk" line 91: . ${i${:U}}: outer +make: "directive-for-escape.mk" line 92: . ${i\}}: inner} +make: "directive-for-escape.mk" line 93: . ${i2}: two +make: "directive-for-escape.mk" line 94: . ${i,}: comma +make: "directive-for-escape.mk" line 95: . adjacent: innerinnerinnerinner +make: no target to make. + +make: stopped in unit-tests +exit status 2 diff --git a/unit-tests/directive-for-escape.mk b/unit-tests/directive-for-escape.mk new file mode 100644 index 000000000000..0bd2af68625a --- /dev/null +++ b/unit-tests/directive-for-escape.mk @@ -0,0 +1,96 @@ +# $NetBSD: directive-for-escape.mk,v 1.3 2020/12/31 14:26:37 rillig Exp $ +# +# Test escaping of special characters in the iteration values of a .for loop. +# These values get expanded later using the :U variable modifier, and this +# escaping and unescaping must pass all characters and strings effectively +# unmodified. + +.MAKEFLAGS: -df + +# Even though the .for loops takes quotes into account when splitting the +# string into words, the quotes don't need to be balances, as of 2020-12-31. +# This could be considered a bug. +ASCII= !"\#$$%&'()*+,-./0-9:;<=>?@A-Z[\]_^a-z{|}~ + +# XXX: As of 2020-12-31, the '#' is not preserved in the expanded body of +# the loop since it would not need only the escaping for the :U variable +# modifier but also the escaping for the line-end comment. +.for chars in ${ASCII} +. info ${chars} +.endfor + +# As of 2020-12-31, using 2 backslashes before be '#' would treat the '#' +# as comment character. Using 3 backslashes doesn't help either since +# then the situation is essentially the same as with 1 backslash. +# This means that a '#' sign cannot be passed in the value of a .for loop +# at all. +ASCII.2020-12-31= !"\\\#$$%&'()*+,-./0-9:;<=>?@A-Z[\]_^a-z{|}~ +.for chars in ${ASCII.2020-12-31} +. info ${chars} +.endfor + +# Cover the code in for_var_len. +# +# XXX: It is unexpected that the variable V gets expanded in the loop body. +# The double '$$' should prevent exactly this. Probably nobody was +# adventurous enough to use literal dollar signs in the values for a .for +# loop. +V= value +VALUES= $$ $${V} $${V:=-with-modifier} $$(V) $$(V:=-with-modifier) +.for i in ${VALUES} +. info $i +.endfor + +# Cover the code for nested '{}' in for_var_len. +# +# The value of VALUES is not a variable expression. Instead, it is meant to +# represent dollar, lbrace, "UNDEF:U", backslash, dollar, backslash, dollar, +# space, nested braces, space, "end}". +VALUES= $${UNDEF:U\$$\$$ {{}} end} +# XXX: Where does the '\$$\$$' get converted into a single '\$'? +.for i in ${VALUES} +. info $i +.endfor + +# A single trailing dollar doesn't happen in practice. +# The dollar sign is correctly passed through to the body of the .for loop. +# There, it is expanded by the .info directive, but even there a trailing +# dollar sign is kept as-is. +.for i in ${:U\$} +. info ${i} +.endfor + +# As of 2020-12-31, the name of the iteration variable can even contain +# colons, which then affects variable expressions having this exact modifier. +# This is clearly an unintended side effect of the implementation. +NUMBERS= one two three +.for NUMBERS:M*e in replaced +. info ${NUMBERS} ${NUMBERS:M*e} +.endfor + +# As of 2020-12-31, the name of the iteration variable can contain braces, +# which gets even more surprising than colons, since it allows to replace +# sequences of variable expressions. There is no practical use case for +# this, though. +BASENAME= one +EXT= .c +.for BASENAME}${EXT in replaced +. info ${BASENAME}${EXT} +.endfor + +# Demonstrate the various ways to refer to the iteration variable. +i= outer +i2= two +i,= comma +.for i in inner +. info . $$i: $i +. info . $${i}: ${i} +. info . $${i:M*}: ${i:M*} +. info . $$(i): $(i) +. info . $$(i:M*): $(i:M*) +. info . $${i$${:U}}: ${i${:U}} +. info . $${i\}}: ${i\}} # XXX: unclear why SubstVarLong needs this +. info . $${i2}: ${i2} +. info . $${i,}: ${i,} +. info . adjacent: $i${i}${i:M*}$i +.endfor diff --git a/unit-tests/directive-for-lines.exp b/unit-tests/directive-for-lines.exp new file mode 100644 index 000000000000..7aeaaa4a7002 --- /dev/null +++ b/unit-tests/directive-for-lines.exp @@ -0,0 +1,10 @@ +make: "directive-for-lines.mk" line 23: expect 23 +make: "directive-for-lines.mk" line 23: expect 23 +make: "directive-for-lines.mk" line 30: expect 30 +make: "directive-for-lines.mk" line 23: expect 23 +make: "directive-for-lines.mk" line 23: expect 23 +make: "directive-for-lines.mk" line 30: expect 30 +make: no target to make. + +make: stopped in unit-tests +exit status 2 diff --git a/unit-tests/directive-for-lines.mk b/unit-tests/directive-for-lines.mk new file mode 100644 index 000000000000..96d659426882 --- /dev/null +++ b/unit-tests/directive-for-lines.mk @@ -0,0 +1,32 @@ +# $NetBSD: directive-for-lines.mk,v 1.3 2020/12/19 12:40:00 rillig Exp $ +# +# Tests for the line numbers that are reported in .for loops. +# +# Between 2007-01-01 (git 4d3c468f96e1080e, parse.c 1.127) and 2020-12-19 +# (parse.c 1.494), the line numbers for the .info directives and error +# messages inside .for loops had been wrong since ParseGetLine skipped empty +# lines, even when collecting the lines for the .for loop body. + +.for outer in a b + +# comment \ +# continued comment + +.for inner in 1 2 + +# comment \ +# continued comment + +VAR= \ + multi-line + +.info expect 23 + +.endfor + +# comment \ +# continued comment + +.info expect 30 + +.endfor diff --git a/unit-tests/directive-for-null.exp b/unit-tests/directive-for-null.exp new file mode 100644 index 000000000000..37a7d68925ed --- /dev/null +++ b/unit-tests/directive-for-null.exp @@ -0,0 +1,10 @@ +make: "(stdin)" line 2: Zero byte read from file +make: "(stdin)" line 2: Unexpected end of file in for loop. +make: "(stdin)" line 3: Zero byte read from file +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +*** Error code 1 (continuing) + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/directive-for-null.mk b/unit-tests/directive-for-null.mk new file mode 100644 index 000000000000..a374f508dd55 --- /dev/null +++ b/unit-tests/directive-for-null.mk @@ -0,0 +1,19 @@ +# $NetBSD: directive-for-null.mk,v 1.1 2020/12/19 16:00:17 rillig Exp $ +# +# Test for parsing a .for loop that accidentally contains a null byte. +# +# As of 2020-12-19, there are 3 error messages: +# +# make: "(stdin)" line 2: Zero byte read from file +# make: "(stdin)" line 2: Unexpected end of file in for loop. +# make: "(stdin)" line 3: Zero byte read from file +# +# The one about "end of file" might be misleading but is due to the +# implementation. On both errors and EOF, ParseGetLine returns NULL. +# +# The one about the "zero byte" in line 3 is surprising since the only +# line that contains a null byte is line 2. + +all: .PHONY + @printf '%s\n' '.for i in 1 2 3' 'VAR=value' '.endfor' | tr 'l' '\0' \ + | ${MAKE} -f - diff --git a/unit-tests/directive-for.exp b/unit-tests/directive-for.exp index af610cc34edd..bdaf4492baf0 100755 --- a/unit-tests/directive-for.exp +++ b/unit-tests/directive-for.exp @@ -1,19 +1,24 @@ make: "directive-for.mk" line 108: outer make: "directive-for.mk" line 133: a:\ a:\file.txt make: "directive-for.mk" line 133: d:\\ make: "directive-for.mk" line 133: d:\\file.txt make: "directive-for.mk" line 140: ( ( ( make: "directive-for.mk" line 140: [ [ [ make: "directive-for.mk" line 140: { { { make: "directive-for.mk" line 140: ) ) ) make: "directive-for.mk" line 140: ] ] ] make: "directive-for.mk" line 140: } } } make: "directive-for.mk" line 140: (()) (()) (()) make: "directive-for.mk" line 140: [[]] [[]] [[]] make: "directive-for.mk" line 140: {{}} {{}} {{}} make: "directive-for.mk" line 140: )( )( )( make: "directive-for.mk" line 140: ][ ][ ][ make: "directive-for.mk" line 140: }{ }{ }{ make: "directive-for.mk" line 148: outer value value make: "directive-for.mk" line 148: outer "quoted" \"quoted\" -exit status 0 +make: "directive-for.mk" line 154: Unknown modifier 'Z' +make: "directive-for.mk" line 155: XXX: Not reached word1 +make: "directive-for.mk" line 155: XXX: Not reached word3 +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/directive-for.mk b/unit-tests/directive-for.mk index 93f0a14f5892..153762509b7a 100755 --- a/unit-tests/directive-for.mk +++ b/unit-tests/directive-for.mk @@ -1,152 +1,159 @@ -# $NetBSD: directive-for.mk,v 1.9 2020/11/15 20:20:58 rillig Exp $ +# $NetBSD: directive-for.mk,v 1.10 2020/12/27 09:58:35 rillig Exp $ # # Tests for the .for directive. # # TODO: Describe naming conventions for the loop variables. # .for f in values # .for file in values # .for _FILE_ in values # .for .FILE. in values # .for _f_ in values # Using the .for loop, lists of values can be produced. # In simple cases, the :@var@${var}@ variable modifier can be used to # reach the same effects. # .undef NUMBERS .for num in 1 2 3 NUMBERS+= ${num} .endfor .if ${NUMBERS} != "1 2 3" . error .endif # The .for loop also works for multiple iteration variables. # This is something that the variable modifier :@ cannot do. .for name value in VARNAME value NAME2 value2 ${name}= ${value} .endfor .if ${VARNAME} != "value" || ${NAME2} != "value2" . error .endif # The .for loop splits the items at whitespace, taking quotes into account, # just like the :M or :S variable modifiers. # # Until 2012-06-03, it had split the items exactly at whitespace, without # taking the quotes into account. This had resulted in 10 words. # .undef WORDS .for var in one t\ w\ o "three three" 'four four' `five six` WORDS+= counted .endfor .if ${WORDS:[#]} != 6 . error .endif # In the body of the .for loop, the iteration variables can be accessed # like normal variables, even though they are not really variables. # # Instead, the expression ${var} is transformed into ${:U1}, ${:U2} and so # on, before the loop body is evaluated. # # A notable effect of this implementation technique is that the .for # iteration variables and the normal global variables live in separate # namespaces and do not influence each other. # var= value before var2= value before .for var var2 in 1 2 3 4 .endfor .if ${var} != "value before" . warning After the .for loop, var must still have its original value. .endif .if ${var2} != "value before" . warning After the .for loop, var2 must still have its original value. .endif # Everything from the paragraph above also applies if the loop body is # empty, even if there is no actual iteration since the loop items are # also empty. # var= value before var2= value before .for var var2 in ${:U} .endfor .if ${var} != "value before" . warning After the .for loop, var must still have its original value. .endif .if ${var2} != "value before" . warning After the .for loop, var2 must still have its original value. .endif # Until 2008-12-21, the values of the iteration variables were simply # inserted as plain text and then parsed as usual, which made it possible # to achieve all kinds of strange effects. # # Before that date, the .for loop expanded to: # EXPANSION+= value # Since that date, the .for loop expands to: # EXPANSION${:U+}= value # EXPANSION= before EXPANSION+ = before .for plus in + EXPANSION${plus}= value .endfor .if ${EXPANSION} != "before" . error This must be a make from before 2009. .endif .if ${EXPANSION+} != "value" . error This must be a make from before 2009. .endif # When the outer .for loop is expanded, it sees the expression ${i} and # expands it. The inner loop then has nothing more to expand. .for i in outer . for i in inner . info ${i} . endfor .endfor # From https://gnats.netbsd.org/29985. # # Until 2008-12-21, the .for loop was expanded by replacing the variable # value literally in the body. This could lead to situations where the # characters from the variable value were interpreted as markup rather than # plain text. # # Until 2012-06-03, the .for loop had split the words at whitespace, without # taking quotes into account. This made it possible to have variable values # like "a:\ a:\file.txt" that ended in a single backslash. Since then, the # variable values have been replaced with expressions of the form ${:U...}, # which are not interpreted as code anymore. # # As of 2020-09-22, a comment in for.c says that it may be possible to # produce an "unwanted substitution", but there is no demonstration code yet. # # The above changes prevent a backslash at the end of a word from being # interpreted as part of the code. Because of this, the trailingBackslash # hack in Var_Subst is no longer needed and as of 2020-09-22, has been # removed. .for path in a:\ a:\file.txt d:\\ d:\\file.txt . info ${path} .endfor # Ensure that braces and parentheses are properly escaped by the .for loop. # Each line must print the same word 3 times. # See GetEscapes. .for v in ( [ { ) ] } (()) [[]] {{}} )( ][ }{ . info $v ${v} $(v) .endfor # As of 2020-10-25, the variable names may contain arbitrary characters, # except for whitespace. This allows for creative side effects. Hopefully # nobody is misusing this "feature". var= outer .for var:Q in value "quoted" . info ${var} ${var:Q} ${var:Q:Q} .endfor + +# XXX: A parse error or evaluation error in the items of the .for loop +# should skip the whole loop. As of 2020-12-27, the loop is expanded twice. +.for var in word1 ${:Uword2:Z} word3 +. info XXX: Not reached ${var} +.endfor + all: @:; diff --git a/unit-tests/directive-if.exp b/unit-tests/directive-if.exp index 21a33fe4cfd6..89a394fc0f22 100644 --- a/unit-tests/directive-if.exp +++ b/unit-tests/directive-if.exp @@ -1,15 +1,17 @@ make: "directive-if.mk" line 13: 0 evaluates to false. make: "directive-if.mk" line 17: 1 evaluates to true. make: "directive-if.mk" line 40: Unknown directive "ifx" -make: "directive-if.mk" line 41: Unknown directive "error" +make: "directive-if.mk" line 41: This is not conditional. make: "directive-if.mk" line 42: if-less else -make: "directive-if.mk" line 43: Unknown directive "error" +make: "directive-if.mk" line 43: This is not conditional. make: "directive-if.mk" line 44: if-less endif make: "directive-if.mk" line 47: Malformed conditional () make: "directive-if.mk" line 57: Quotes in plain words are probably a mistake. make: "directive-if.mk" line 66: Don't do this, always put a space after a directive. make: "directive-if.mk" line 70: Don't do this, always put a space after a directive. make: "directive-if.mk" line 76: Don't do this, always put a space around comparison operators. +make: "directive-if.mk" line 82: Don't do this, always put a space after a directive. +make: "directive-if.mk" line 86: Don't do this, always put a space after a directive. make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/directive-if.mk b/unit-tests/directive-if.mk index 3b1d13c7a0c0..b1ad2396b398 100644 --- a/unit-tests/directive-if.mk +++ b/unit-tests/directive-if.mk @@ -1,81 +1,89 @@ -# $NetBSD: directive-if.mk,v 1.7 2020/11/15 20:20:58 rillig Exp $ +# $NetBSD: directive-if.mk,v 1.9 2020/12/19 22:33:11 rillig Exp $ # # Tests for the .if directive. # # See also: # cond-*.mk # TODO: Implementation .if 0 . error .else . info 0 evaluates to false. .endif .if 1 . info 1 evaluates to true. .else . error .endif # There is no '.ifx'. # # The commit from 2005-05-01 intended to detect this situation, but it failed # to do this since the call to is_token had its arguments switched. They were # expected as (str, token, token_len) but were actually passed as (token, str, # token_len). This made is_token return true even if the directive was # directly followed by alphanumerical characters, which was wrong. The # typical cases produced an error message such as "Malformed conditional # (x 123)", while the intended error message was "Unknown directive". # # Back at that time, the commits only modified the main code but did not add # the corresponding unit tests. This allowed the bug to hide for more than # 15 years. # # Since 2020-11-10, the correct error message is produced. The '.ifx' is no # longer interpreted as a variant of '.if', therefore the '.error' and '.else' # are interpreted as ordinary directives, producing the error messages # "if-less else" and "if-less endif". .ifx 123 -. error +.info This is not conditional. .else -. error +.info This is not conditional. .endif # Missing condition. .if . error .else . error .endif # A plain word must not start with a '"'. It may contain a embedded quotes # though, which are kept. The quotes need not be balanced. The next space # ends the word, and the remaining " || 1" is parsed as "or true". .if ${:Uplain"""""} == plain""""" || 1 . info Quotes in plain words are probably a mistake. # XXX: Accepting quotes in plain words is probably a mistake as well. .else . error .endif .if0 . error .else . info Don't do this, always put a space after a directive. .endif .if${:U-3} . info Don't do this, always put a space after a directive. .else . error .endif .if${:U-3}>-4 . info Don't do this, always put a space around comparison operators. .else . error .endif +.if(1) +. info Don't do this, always put a space after a directive. +.endif + +.if!0 +. info Don't do this, always put a space after a directive. +.endif + all: diff --git a/unit-tests/directive-include.mk b/unit-tests/directive-include.mk index 120706cef8d7..d36914b25a63 100755 --- a/unit-tests/directive-include.mk +++ b/unit-tests/directive-include.mk @@ -1,31 +1,34 @@ -# $NetBSD: directive-include.mk,v 1.4 2020/11/03 17:17:31 rillig Exp $ +# $NetBSD: directive-include.mk,v 1.5 2020/11/21 14:59:11 rillig Exp $ # # Tests for the .include directive, which includes another file. # TODO: Implementation .MAKEFLAGS: -dc # All included files are recorded in the variable .MAKE.MAKEFILES. # In this test, only the basenames of the files are compared since # the directories can differ. .include "/dev/null" .if ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null" . error .endif # Each file is recorded only once in the variable .MAKE.MAKEFILES. # Between 2015-11-26 and 2020-10-31, the very last file could be repeated, # due to an off-by-one bug in ParseTrackInput. .include "/dev/null" .if ${.MAKE.MAKEFILES:T} != "${.PARSEFILE} null" . error .endif .include "nonexistent.mk" .include "/dev/null" # size 0 # including a directory technically succeeds, but shouldn't. #.include "." # directory +# As of 2020-11-21, anything after the delimiter '"' is ignored. +.include "/dev/null" and ignore anything in the rest of the line. + all: @:; diff --git a/unit-tests/directive-info.exp b/unit-tests/directive-info.exp index 971f417b706a..2652c191460c 100644 --- a/unit-tests/directive-info.exp +++ b/unit-tests/directive-info.exp @@ -1,14 +1,15 @@ -make: "directive-info.mk" line 7: begin .info tests -make: "directive-info.mk" line 8: Unknown directive "inf" -make: "directive-info.mk" line 9: Unknown directive "info" -make: "directive-info.mk" line 10: message -make: "directive-info.mk" line 11: indented message -make: "directive-info.mk" line 12: Unknown directive "information" -make: "directive-info.mk" line 13: message -make: "directive-info.mk" line 18: Unknown directive "info" -make: "directive-info.mk" line 19: Unknown directive "info" -make: "directive-info.mk" line 22: Unknown directive "info-message" -make: "directive-info.mk" line 23: no-target: no-source +make: "directive-info.mk" line 11: begin .info tests +make: "directive-info.mk" line 12: Unknown directive "inf" +make: "directive-info.mk" line 13: Missing argument for ".info" +make: "directive-info.mk" line 14: message +make: "directive-info.mk" line 15: indented message +make: "directive-info.mk" line 16: Unknown directive "information" +make: "directive-info.mk" line 17: Unknown directive "information" +make: "directive-info.mk" line 22: Missing argument for ".info" +make: "directive-info.mk" line 23: Missing argument for ".info" +make: "directive-info.mk" line 26: Unknown directive "info-message" +make: "directive-info.mk" line 27: no-target: no-source +make: "directive-info.mk" line 36: expect line 30 for multi-line message make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/directive-info.mk b/unit-tests/directive-info.mk index bbfc80ea0c9a..5feea0cde565 100644 --- a/unit-tests/directive-info.mk +++ b/unit-tests/directive-info.mk @@ -1,27 +1,39 @@ -# $NetBSD: directive-info.mk,v 1.4 2020/11/15 11:57:00 rillig Exp $ +# $NetBSD: directive-info.mk,v 1.8 2020/12/19 22:33:11 rillig Exp $ # # Tests for the .info directive. +# +# Until parse.c 1.502 from 2020-12-19, a missing argument to the directive +# produced the wrong error message "Unknown directive". Since parse.c 1.503 +# from 2020-12-19, the correct "Missing argument" is produced. # TODO: Implementation .info begin .info tests .inf # misspelled -.info # oops: message should be "missing parameter" +.info # "Missing argument" .info message .info indented message .information -.information message # oops: misspelled +.information message # Accepted before 2020-12-13 01:07:54. .info.man: # not a message, but possibly a suffix rule # Even if lines would have trailing whitespace, this would be trimmed by # ParseGetLine. .info .info # comment .info: message # This is a dependency declaration. .info-message # This is an unknown directive. .info no-target: no-source # This is a .info directive, not a dependency. # See directive.mk for more tests of this kind. +# Since at least 2002-01-01, the line number that is used in error messages +# and the .info directives is the number of completely read lines. For the +# following multi-line directive, this means that the reported line number is +# the one of the last line, not the first line. +.info expect line 30 for\ + multi$\ + -line message + all: @:; diff --git a/unit-tests/directive-misspellings.exp b/unit-tests/directive-misspellings.exp new file mode 100644 index 000000000000..e51d8473b305 --- /dev/null +++ b/unit-tests/directive-misspellings.exp @@ -0,0 +1,45 @@ +make: "directive-misspellings.mk" line 12: Unknown directive "dinclud" +make: "directive-misspellings.mk" line 14: Unknown directive "dincludx" +make: "directive-misspellings.mk" line 15: .include filename must be delimited by '"' or '<' +make: "directive-misspellings.mk" line 17: Unknown directive "erro" +make: "directive-misspellings.mk" line 18: Unknown directive "errox" +make: "directive-misspellings.mk" line 22: Unknown directive "expor" +make: "directive-misspellings.mk" line 24: Unknown directive "exporx" +make: "directive-misspellings.mk" line 25: Unknown directive "exports" +make: "directive-misspellings.mk" line 27: Unknown directive "export-en" +make: "directive-misspellings.mk" line 30: Unknown directive "export-environment" +make: "directive-misspellings.mk" line 32: Unknown directive "export-litera" +make: "directive-misspellings.mk" line 34: Unknown directive "export-literax" +make: "directive-misspellings.mk" line 35: Unknown directive "export-literally" +make: "directive-misspellings.mk" line 37: Unknown directive "-includ" +make: "directive-misspellings.mk" line 39: Unknown directive "-includx" +make: "directive-misspellings.mk" line 40: .include filename must be delimited by '"' or '<' +make: "directive-misspellings.mk" line 42: Unknown directive "includ" +make: "directive-misspellings.mk" line 43: Could not find file +make: "directive-misspellings.mk" line 44: Unknown directive "includx" +make: "directive-misspellings.mk" line 45: .include filename must be delimited by '"' or '<' +make: "directive-misspellings.mk" line 47: Unknown directive "inf" +make: "directive-misspellings.mk" line 48: msg +make: "directive-misspellings.mk" line 49: Unknown directive "infx" +make: "directive-misspellings.mk" line 50: Unknown directive "infos" +make: "directive-misspellings.mk" line 52: Unknown directive "sinclud" +make: "directive-misspellings.mk" line 54: Unknown directive "sincludx" +make: "directive-misspellings.mk" line 55: .include filename must be delimited by '"' or '<' +make: "directive-misspellings.mk" line 57: Unknown directive "unde" +make: "directive-misspellings.mk" line 59: Unknown directive "undex" +make: "directive-misspellings.mk" line 60: Unknown directive "undefs" +make: "directive-misspellings.mk" line 62: Unknown directive "unexpor" +make: "directive-misspellings.mk" line 64: Unknown directive "unexporx" +make: "directive-misspellings.mk" line 65: Unknown directive "unexports" +make: "directive-misspellings.mk" line 67: Unknown directive "unexport-en" +make: "directive-misspellings.mk" line 69: The directive .unexport-env does not take arguments +make: "directive-misspellings.mk" line 70: Unknown directive "unexport-enx" +make: "directive-misspellings.mk" line 71: Unknown directive "unexport-envs" +make: "directive-misspellings.mk" line 73: Unknown directive "warn" +make: "directive-misspellings.mk" line 74: Unknown directive "warnin" +make: "directive-misspellings.mk" line 75: warning: msg +make: "directive-misspellings.mk" line 76: Unknown directive "warninx" +make: "directive-misspellings.mk" line 77: Unknown directive "warnings" +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/directive-misspellings.mk b/unit-tests/directive-misspellings.mk new file mode 100644 index 000000000000..5f479f03b7f1 --- /dev/null +++ b/unit-tests/directive-misspellings.mk @@ -0,0 +1,79 @@ +# $NetBSD: directive-misspellings.mk,v 1.3 2020/12/13 01:10:22 rillig Exp $ +# +# Tests for misspelled directives. +# +# Before 2020-12-12, make didn't catch most of these misspellings. For +# example, the directive ".exporting" was interpreted as if it were spelled +# ".export ing", which would export the variable named "ing" if that existed. +# Another misspelling, as improbable as the others, was that both ".infos" and +# ".information" were aliases to ".info" since the code for these diagnostic +# directives just skipped any letters following the "error", "warn" or "info". + +.dinclud "file" +.dinclude "file" +.dincludx "file" +.dincludes "file" # XXX: the 's' is not meant to be a filename + +.erro msg +.errox msg +# no .error since that would exit immediately +# no .errors since that would exit immediately, even with the typo + +.expor varname +.export varname +.exporx varname +.exports varname # Accepted before 2020-12-13 01:07:54. + +.export-en # Accepted before 2020-12-13 01:07:54. +.export-env +.export-env extra argument # XXX: undetected extra argument +.export-environment # Accepted before 2020-12-13 01:07:54. + +.export-litera varname # Accepted before 2020-12-13 01:07:54. +.export-literal varname +.export-literax varname # Accepted before 2020-12-13 01:07:54. +.export-literally varname # Accepted before 2020-12-13 01:07:54. + +.-includ "file" +.-include "file" +.-includx "file" +.-includes "file" # XXX: the 's' is not meant to be a filename + +.includ "file" +.include "file" +.includx "file" +.includex "file" # XXX: the 's' is not meant to be a filename + +.inf msg +.info msg +.infx msg +.infos msg # Accepted before 2020-12-13 01:07:54. + +.sinclud "file" +.sinclude "file" +.sincludx "file" +.sincludes "file" # XXX: the 's' is not meant to be a filename + +.unde varname +.undef varname +.undex varname +.undefs varname # Accepted before 2020-12-13 01:07:54. + +.unexpor varname +.unexport varname +.unexporx varname +.unexports varname # Accepted before 2020-12-12 18:00:18. + +.unexport-en # Accepted before 2020-12-12 18:11:42. +.unexport-env +.unexport-env extra argument # Accepted before 2020-12-12 18:00:18. +.unexport-enx # Accepted before 2020-12-12 18:00:18. +.unexport-envs # Accepted before 2020-12-12 18:00:18. + +.warn msg +.warnin msg +.warning msg +.warninx msg +.warnings msg # Accepted before 2020-12-13 01:07:54. + +all: diff --git a/unit-tests/directive-undef.exp b/unit-tests/directive-undef.exp index 303d5a3e2a27..d64cb8b5afe0 100644 --- a/unit-tests/directive-undef.exp +++ b/unit-tests/directive-undef.exp @@ -1,4 +1,5 @@ -make: "directive-undef.mk" line 16: Unknown directive "unde" +make: "directive-undef.mk" line 29: The .undef directive requires an argument +make: "directive-undef.mk" line 86: Unknown modifier 'Z' make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/directive-undef.mk b/unit-tests/directive-undef.mk index c72513a1bf5a..b9a69f733517 100644 --- a/unit-tests/directive-undef.mk +++ b/unit-tests/directive-undef.mk @@ -1,21 +1,90 @@ -# $NetBSD: directive-undef.mk,v 1.5 2020/11/03 17:17:31 rillig Exp $ +# $NetBSD: directive-undef.mk,v 1.9 2020/12/22 20:10:21 rillig Exp $ # # Tests for the .undef directive. +# +# See also: +# directive-misspellings.mk -# As of 2020-07-28, .undef only undefines the first variable. -# All further variable names are silently ignored. -# See parse.c, string literal "undef". +# Before var.c 1.737 from 2020-12-19, .undef only undefined the first +# variable, silently skipping all further variable names. +# +# Before var.c 1.761 from 2020-12-22, .undef complained about too many +# arguments. +# +# Since var.c 1.761 from 2020-12-22, .undef handles multiple variable names +# just like the .export directive. 1= 1 2= 2 3= 3 .undef 1 2 3 -.if ${1:U_}${2:U_}${3:U_} != _23 +.if ${1:U_}${2:U_}${3:U_} != ___ . warning $1$2$3 .endif -.unde # misspelled -.undef # oops: missing argument -.undefined # oops: misspelled + +# Without any arguments, until var.c 1.736 from 2020-12-19, .undef tried +# to delete the variable with the empty name, which never exists; see +# varname-empty.mk. Since var.c 1.737 from 2020-12-19, .undef complains +# about a missing argument. +.undef + + +# Trying to delete the variable with the empty name is ok, it just won't +# ever do anything since that variable is never defined. +.undef ${:U} + + +# The argument of .undef is first expanded exactly once and then split into +# words, just like everywhere else. This prevents variables whose names +# contain spaces or unbalanced 'single' or "double" quotes from being +# undefined, but these characters do not appear in variables names anyway. +1= 1 +2= 2 +3= 3 +${:U1 2 3}= one two three +VARNAMES= 1 2 3 +.undef ${VARNAMES} # undefines the variable "1 2 3" +.if !defined(${:U1 2 3}) +. error +.endif +.if ${1:U_}${2:U_}${3:U_} != "___" # these are still defined +. error +.endif + + +# A variable named " " cannot be undefined. There's no practical use case +# for such variables anyway. +SPACE= ${:U } +${SPACE}= space +.if !defined(${SPACE}) +. error +.endif +.undef ${SPACE} +.if !defined(${SPACE}) +. error +.endif + + +# A variable named "$" can be undefined since the argument to .undef is +# expanded exactly once, before being split into words. +DOLLAR= $$ +${DOLLAR}= dollar +.if !defined(${DOLLAR}) +. error +.endif +.undef ${DOLLAR} +.if defined(${DOLLAR}) +. error +.endif + + +# Since var.c 1.762 from 2020-12-22, parse errors in the argument should be +# properly detected and should stop the .undef directive from doing any work. +# +# As of var.c 1.762, this doesn't happen though because the error handling +# in Var_Parse and Var_Subst is not done properly. +.undef ${VARNAMES:L:Z} + all: @:; diff --git a/unit-tests/directive-unexport-env.exp b/unit-tests/directive-unexport-env.exp index 39a9383953dd..677596ea4aa8 100644 --- a/unit-tests/directive-unexport-env.exp +++ b/unit-tests/directive-unexport-env.exp @@ -1 +1,18 @@ -exit status 0 +make: "directive-unexport-env.mk" line 13: Unknown directive "unexport-en" +make: "directive-unexport-env.mk" line 15: Unknown directive "unexport-environment" +Global:UT_EXPORTED = value +Global:UT_UNEXPORTED = value +Global:.MAKE.EXPORTED = UT_EXPORTED +make: "directive-unexport-env.mk" line 21: The directive .unexport-env does not take arguments +Var_Parse: ${.MAKE.EXPORTED:O:u} with VARE_WANTRES +Applying ${.MAKE.EXPORTED:O} to "UT_EXPORTED" (VARE_WANTRES, none, none) +Result of ${.MAKE.EXPORTED:O} is "UT_EXPORTED" (VARE_WANTRES, none, none) +Applying ${.MAKE.EXPORTED:u} to "UT_EXPORTED" (VARE_WANTRES, none, none) +Result of ${.MAKE.EXPORTED:u} is "UT_EXPORTED" (VARE_WANTRES, none, none) +Unexporting "UT_EXPORTED" +Global:delete .MAKE.EXPORTED +Global:.MAKEFLAGS = -r -k -d v -d +Global:.MAKEFLAGS = -r -k -d v -d 0 +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/directive-unexport-env.mk b/unit-tests/directive-unexport-env.mk index 637286af0d6b..ef58ae732e6d 100644 --- a/unit-tests/directive-unexport-env.mk +++ b/unit-tests/directive-unexport-env.mk @@ -1,12 +1,25 @@ -# $NetBSD: directive-unexport-env.mk,v 1.3 2020/11/03 17:17:31 rillig Exp $ +# $NetBSD: directive-unexport-env.mk,v 1.7 2020/12/12 18:11:42 rillig Exp $ # # Tests for the .unexport-env directive. +# +# Before 2020-12-13, the directive unexport-env wrongly accepted arguments +# and ignored them. +# +# Before 2020-12-13, misspelled directive names like "unexport-environment" +# were not properly detected. # TODO: Implementation -.unexport-en # oops: misspelled +.unexport-en # misspelled .unexport-env # ok -.unexport-environment # oops: misspelled +.unexport-environment # misspelled + +.MAKEFLAGS: -dv +UT_EXPORTED= value +UT_UNEXPORTED= value +.export UT_EXPORTED +.unexport-env UT_EXPORTED UT_UNEXPORTED +.MAKEFLAGS: -d0 all: @:; diff --git a/unit-tests/directive-unexport.exp b/unit-tests/directive-unexport.exp index 72b24e7344fc..d59fb4713259 100644 --- a/unit-tests/directive-unexport.exp +++ b/unit-tests/directive-unexport.exp @@ -1,8 +1,5 @@ -make: "directive-unexport.mk" line 14: UT_A=a UT_B=b UT_C=c -make: "directive-unexport.mk" line 15: UT_A UT_B UT_C -make: "directive-unexport.mk" line 23: UT_A=a UT_B=b UT_C=c -make: "directive-unexport.mk" line 24: -make: "directive-unexport.mk" line 26: Unknown directive "unexpor" -make: Fatal errors encountered -- cannot continue -make: stopped in unit-tests -exit status 1 +make: "directive-unexport.mk" line 18: UT_A=a UT_B=b UT_C=c +make: "directive-unexport.mk" line 19: UT_A UT_B UT_C +make: "directive-unexport.mk" line 27: UT_A=a UT_B=b UT_C=c +make: "directive-unexport.mk" line 28: +exit status 0 diff --git a/unit-tests/directive-unexport.mk b/unit-tests/directive-unexport.mk index 3ba4a1b1f307..efc103efedf6 100644 --- a/unit-tests/directive-unexport.mk +++ b/unit-tests/directive-unexport.mk @@ -1,31 +1,33 @@ -# $NetBSD: directive-unexport.mk,v 1.5 2020/11/03 17:17:31 rillig Exp $ +# $NetBSD: directive-unexport.mk,v 1.7 2020/12/13 01:07:54 rillig Exp $ # # Tests for the .unexport directive. - -# TODO: Implementation +# +# Before 2020-12-13, misspelled directives like ".unexporting" or +# ".unexport-en" had not been detected properly. +# +# See also: +# directive-misspellings.mk # First, export 3 variables. UT_A= a UT_B= b UT_C= c .export UT_A UT_B UT_C # Show the exported variables and their values. .info ${:!env|sort|grep '^UT_'!} .info ${.MAKE.EXPORTED} # XXX: Now try to unexport all of them. The variables are still exported # but not mentioned in .MAKE.EXPORTED anymore. # See the ":N" in Var_UnExport for the implementation. *= asterisk .unexport * .info ${:!env|sort|grep '^UT_'!} .info ${.MAKE.EXPORTED} -.unexpor # misspelled .unexport # oops: missing argument -.unexporting works # oops: misspelled all: @:; diff --git a/unit-tests/directive-warning.exp b/unit-tests/directive-warning.exp index 630285fd3612..b08b3207392c 100644 --- a/unit-tests/directive-warning.exp +++ b/unit-tests/directive-warning.exp @@ -1,11 +1,11 @@ -make: "directive-warning.mk" line 7: Unknown directive "warn" -make: "directive-warning.mk" line 8: Unknown directive "warn" -make: "directive-warning.mk" line 9: Unknown directive "warnin" -make: "directive-warning.mk" line 10: Unknown directive "warnin" -make: "directive-warning.mk" line 11: Unknown directive "warning" -make: "directive-warning.mk" line 12: warning: message -make: "directive-warning.mk" line 13: Unknown directive "warnings" -make: "directive-warning.mk" line 14: warning: messages +make: "directive-warning.mk" line 11: Unknown directive "warn" +make: "directive-warning.mk" line 12: Unknown directive "warn" +make: "directive-warning.mk" line 13: Unknown directive "warnin" +make: "directive-warning.mk" line 14: Unknown directive "warnin" +make: "directive-warning.mk" line 15: Missing argument for ".warning" +make: "directive-warning.mk" line 16: warning: message +make: "directive-warning.mk" line 17: Unknown directive "warnings" +make: "directive-warning.mk" line 18: Unknown directive "warnings" make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/directive-warning.mk b/unit-tests/directive-warning.mk index 75560aa9e4df..d586c9fed170 100644 --- a/unit-tests/directive-warning.mk +++ b/unit-tests/directive-warning.mk @@ -1,17 +1,21 @@ -# $NetBSD: directive-warning.mk,v 1.3 2020/11/03 17:17:31 rillig Exp $ +# $NetBSD: directive-warning.mk,v 1.6 2020/12/19 22:33:11 rillig Exp $ # # Tests for the .warning directive. +# +# Until parse.c 1.502 from 2020-12-19, a missing argument to the directive +# produced the wrong error message "Unknown directive". Since parse.c 1.503 +# from 2020-12-19, the correct "Missing argument" is produced. # TODO: Implementation .warn # misspelled .warn message # misspelled .warnin # misspelled .warnin message # misspelled -.warning # oops: should be "missing argument" +.warning # "Missing argument" .warning message # ok .warnings # misspelled -.warnings messages # oops +.warnings messages # Accepted before 2020-12-13 01:07:54. all: @:; diff --git a/unit-tests/jobs-error-indirect.exp b/unit-tests/jobs-error-indirect.exp new file mode 100644 index 000000000000..5c5a3801f4f6 --- /dev/null +++ b/unit-tests/jobs-error-indirect.exp @@ -0,0 +1,8 @@ +false +*** [indirect] Error code 1 + +make: stopped in unit-tests +1 error + +make: stopped in unit-tests +exit status 2 diff --git a/unit-tests/jobs-error-indirect.mk b/unit-tests/jobs-error-indirect.mk new file mode 100644 index 000000000000..55e193d9b18c --- /dev/null +++ b/unit-tests/jobs-error-indirect.mk @@ -0,0 +1,21 @@ +# $NetBSD: jobs-error-indirect.mk,v 1.1 2020/12/01 17:50:04 rillig Exp $ +# +# Ensure that in jobs mode, when a command fails, the current directory is +# printed, to aid in debugging. +# +# XXX: This test is run without the -k flag, which prints "stopped in" twice. +# Why? +# +# This particular case is not the cause for the PRs, but it is very close. +# +# https://gnats.netbsd.org/55578 +# https://gnats.netbsd.org/55832 +# +# + +.MAKEFLAGS: -j1 + +all: .PHONY indirect + +indirect: .PHONY + false diff --git a/unit-tests/jobs-error-nested-make.exp b/unit-tests/jobs-error-nested-make.exp new file mode 100644 index 000000000000..88c32ab8d1f6 --- /dev/null +++ b/unit-tests/jobs-error-nested-make.exp @@ -0,0 +1,11 @@ +make -f jobs-error-nested-make.mk nested +false +*** [nested] Error code 1 + +make: stopped in unit-tests +1 error + +make: stopped in unit-tests + +make: stopped in unit-tests +exit status 2 diff --git a/unit-tests/jobs-error-nested-make.mk b/unit-tests/jobs-error-nested-make.mk new file mode 100644 index 000000000000..8cccf7df6a52 --- /dev/null +++ b/unit-tests/jobs-error-nested-make.mk @@ -0,0 +1,20 @@ +# $NetBSD: jobs-error-nested-make.mk,v 1.2 2021/01/07 18:11:23 sjg Exp $ +# +# Ensure that in jobs mode, when a command fails, the current directory is +# printed, to aid in debugging, even if the target is marked as .MAKE. +# This marker is typically used for targets like 'all' that descend into +# subdirectories. +# +# XXX: In case of .MAKE targets, the "stopped if" output has been suppressed +# since job.c 1.198 from 2020-06-19. +# +# https://gnats.netbsd.org/55578 +# https://gnats.netbsd.org/55832 + +.MAKEFLAGS: -j1 + +all: .PHONY .MAKE + ${MAKE} -f ${MAKEFILE} nested + +nested: .PHONY + false diff --git a/unit-tests/jobs-error-nested.exp b/unit-tests/jobs-error-nested.exp new file mode 100644 index 000000000000..f96b5d016777 --- /dev/null +++ b/unit-tests/jobs-error-nested.exp @@ -0,0 +1,15 @@ +make -f jobs-error-nested.mk nested +false +*** [nested] Error code 1 + +make: stopped in unit-tests +1 error + +make: stopped in unit-tests +*** [all] Error code 2 + +make: stopped in unit-tests +1 error + +make: stopped in unit-tests +exit status 2 diff --git a/unit-tests/jobs-error-nested.mk b/unit-tests/jobs-error-nested.mk new file mode 100644 index 000000000000..879bfff89984 --- /dev/null +++ b/unit-tests/jobs-error-nested.mk @@ -0,0 +1,20 @@ +# $NetBSD: jobs-error-nested.mk,v 1.1 2020/12/01 17:50:04 rillig Exp $ +# +# Ensure that in jobs mode, when a command fails, the current directory is +# printed, to aid in debugging. +# +# XXX: This test is run without the -k flag, which prints "stopped in" 4 +# times. Why? +# +# This particular case is not the cause for the PRs, but it is very close. +# +# https://gnats.netbsd.org/55578 +# https://gnats.netbsd.org/55832 + +.MAKEFLAGS: -j1 + +all: .PHONY + ${MAKE} -f ${MAKEFILE} nested + +nested: .PHONY + false diff --git a/unit-tests/make-exported.mk b/unit-tests/make-exported.mk index db7f09dc490f..58cb15183b8d 100755 --- a/unit-tests/make-exported.mk +++ b/unit-tests/make-exported.mk @@ -1,25 +1,25 @@ # $NetBSD: make-exported.mk,v 1.6 2020/10/05 19:27:48 rillig Exp $ # # As of 2020-08-09, the code in Var_Export is shared between the .export # directive and the .MAKE.EXPORTED variable. This leads to non-obvious # behavior for certain variable assignments. -env= make-exported-value-env -literal= make-exported-value-literal UT_VAR= ${UNEXPANDED} # Before 2020-10-03, the following line took the code path of .export-env, # which was surprising behavior. Since 2020-10-03 this line tries to # export the variable named "-env", but that is rejected because the # variable name starts with a hyphen. .MAKE.EXPORTED= -env # Before 2020-10-03, if the value of .MAKE.EXPORTED started with "-literal", # make behaved like a mixture of .export-literal and a regular .export. # # Since 2020-10-03, the "variable" named "-literal" is not exported anymore, # it is just ignored since its name starts with '-'. .MAKE.EXPORTED= -literal UT_VAR all: - @env | sort | grep -E '^UT_|make-exported-value' || true + @env | sort | egrep '^UT_|make-exported-value' || true diff --git a/unit-tests/meta-cmd-cmp.exp b/unit-tests/meta-cmd-cmp.exp new file mode 100644 index 000000000000..bfc52123e3b2 --- /dev/null +++ b/unit-tests/meta-cmd-cmp.exp @@ -0,0 +1,37 @@ +one: +Building .meta-cmd-cmp.cmp +Building .meta-cmd-cmp.nocmp +Building .meta-cmd-cmp.cmp2 +This line not compared FLAGS= +Skipping meta for .END: .SPECIAL +two: +`.meta-cmd-cmp.cmp' is up to date. +`.meta-cmd-cmp.nocmp' is up to date. +.meta-cmd-cmp.cmp2.meta: 3: cannot compare command using .OODATE +`.meta-cmd-cmp.cmp2' is up to date. +Skipping meta for .END: .SPECIAL +change1: +.meta-cmd-cmp.cmp.meta: 2: a build command has changed +@echo FLAGS= > .meta-cmd-cmp.cmp +vs +@echo FLAGS=changed > .meta-cmd-cmp.cmp +Building .meta-cmd-cmp.cmp +`.meta-cmd-cmp.nocmp' is up to date. +.meta-cmd-cmp.cmp2.meta: 3: cannot compare command using .OODATE +`.meta-cmd-cmp.cmp2' is up to date. +Skipping meta for .END: .SPECIAL +change2: +.meta-cmd-cmp.cmp.meta: 2: a build command has changed +@echo FLAGS=changed > .meta-cmd-cmp.cmp +vs +@echo FLAGS= > .meta-cmd-cmp.cmp +Building .meta-cmd-cmp.cmp +`.meta-cmd-cmp.nocmp' is up to date. +.meta-cmd-cmp.cmp2.meta: 2: a build command has changed +@echo FLAGS2= > .meta-cmd-cmp.cmp2 +vs +@echo FLAGS2=changed > .meta-cmd-cmp.cmp2 +Building .meta-cmd-cmp.cmp2 +This line not compared FLAGS= +Skipping meta for .END: .SPECIAL +exit status 0 diff --git a/unit-tests/meta-cmd-cmp.mk b/unit-tests/meta-cmd-cmp.mk new file mode 100644 index 000000000000..a1c0f7c10063 --- /dev/null +++ b/unit-tests/meta-cmd-cmp.mk @@ -0,0 +1,52 @@ +# $NetBSD: meta-cmd-cmp.mk,v 1.2 2020/12/05 22:51:34 sjg Exp $ +# +# Tests META_MODE command line comparison +# + +.MAIN: all + +.MAKE.MODE= meta verbose silent=yes curdirok=yes +tf:= .${.PARSEFILE:R} + +.if ${.TARGETS:Nall} == "" +all: prep one two change1 change2 post + +CLEANFILES= ${tf}* + +prep post: .PHONY + @rm -f ${CLEANFILES} + +.endif + +FLAGS?= +FLAGS2?= + +tests= ${tf}.cmp ${tf}.nocmp ${tf}.cmp2 + +${tf}.cmp: + @echo FLAGS=${FLAGS:Uempty} > $@ + +${tf}.nocmp: .NOMETA_CMP + @echo FLAGS=${FLAGS:Uempty} > $@ + +# a line containing ${.OODATE} will not be compared +# this allows the trick below +${tf}.cmp2: + @echo FLAGS2=${FLAGS2:Uempty} > $@ + @echo This line not compared FLAGS=${FLAGS:Uempty} ${.OODATE:MNOMETA_CMP} + +# these do the same +one two: .PHONY + @echo $@: + @${.MAKE} -dM -r -C ${.CURDIR} -f ${MAKEFILE} ${tests} + +change1: .PHONY + @echo $@: + @${.MAKE} -dM -r -C ${.CURDIR} -f ${MAKEFILE} FLAGS=changed ${tests} + +change2: .PHONY + @echo $@: + @${.MAKE} -dM -r -C ${.CURDIR} -f ${MAKEFILE} FLAGS2=changed ${tests} + +# don't let gcov mess up the results +.MAKE.META.IGNORE_PATTERNS+= *.gcda diff --git a/unit-tests/modmisc.exp b/unit-tests/modmisc.exp index 94f131052fdc..10475e65ee0f 100644 --- a/unit-tests/modmisc.exp +++ b/unit-tests/modmisc.exp @@ -1,21 +1,20 @@ -make: Unknown modifier '$' path=':/bin:/tmp::/:.:/no/such/dir:.' path='/bin:/tmp:/:/no/such/dir' path='/bin:/tmp:/:/no/such/dir' path='/bin':'/tmp':'/':'/no/such/dir' path='/bin':'/tmp':'/':'/no/such/dir' path_/usr/xbin=/opt/xbin/ paths=/bin /tmp / /no/such/dir /opt/xbin PATHS=/BIN /TMP / /NO/SUCH/DIR /OPT/XBIN The answer is 42 S: C: @: S:empty C:empty @: mod-quote: new line mod-break-many-words: 500 exit status 0 diff --git a/unit-tests/modmisc.mk b/unit-tests/modmisc.mk index 64a84ce0dadd..9ace35c15162 100644 --- a/unit-tests/modmisc.mk +++ b/unit-tests/modmisc.mk @@ -1,92 +1,65 @@ -# $NetBSD: modmisc.mk,v 1.51 2020/11/15 20:20:58 rillig Exp $ +# $NetBSD: modmisc.mk,v 1.52 2020/12/20 19:29:06 rillig Exp $ # # miscellaneous modifier tests # do not put any dirs in this list which exist on some # but not all target systems - an exists() check is below. path= :/bin:/tmp::/:.:/no/such/dir:. # strip cwd from path. MOD_NODOT= S/:/ /g:N.:ts: # and decorate, note that $'s need to be doubled. Also note that # the modifier_variable can be used with other modifiers. MOD_NODOTX= S/:/ /g:N.:@d@'$$d'@ # another mod - pretend it is more interesting MOD_HOMES= S,/home/,/homes/, MOD_OPT= @d@$${exists($$d):?$$d:$${d:S,/usr,/opt,}}@ MOD_SEP= S,:, ,g all: modvar modvarloop modsysv emptyvar undefvar all: mod-quote all: mod-break-many-words # See also sysv.mk. modsysv: @echo "The answer is ${libfoo.a:L:libfoo.a=42}" # Demonstrates modifiers that are given indirectly from a variable. modvar: @echo "path='${path}'" @echo "path='${path:${MOD_NODOT}}'" @echo "path='${path:S,home,homes,:${MOD_NODOT}}'" @echo "path=${path:${MOD_NODOTX}:ts:}" @echo "path=${path:${MOD_HOMES}:${MOD_NODOTX}:ts:}" .for d in ${path:${MOD_SEP}:N.} /usr/xbin path_$d?= ${d:${MOD_OPT}:${MOD_HOMES}}/ paths+= ${d:${MOD_OPT}:${MOD_HOMES}} .endfor modvarloop: @echo "path_/usr/xbin=${path_/usr/xbin}" @echo "paths=${paths}" @echo "PATHS=${paths:tu}" # When a modifier is applied to the "" variable, the result is discarded. emptyvar: @echo S:${:S,^$,empty,} @echo C:${:C,^$,empty,} @echo @:${:@var@${var}@} # The :U modifier turns even the "" variable into something that has a value. # The value of the resulting expression is empty, but is still considered to # contain a single empty word. This word can be accessed by the :S and :C # modifiers, but not by the :@ modifier since it explicitly skips empty words. undefvar: @echo S:${:U:S,^$,empty,} @echo C:${:U:C,^$,empty,} @echo @:${:U:@var@empty@} mod-quote: @echo $@: new${.newline:Q}${.newline:Q}line # Cover the bmake_realloc in Str_Words. mod-break-many-words: @echo $@: ${UNDEF:U:range=500:[#]} - -# To apply a modifier indirectly via another variable, the whole -# modifier must be put into a single variable expression. -.if ${value:L:${:US}${:U,value,replacement,}} != "S,value,replacement,}" -. warning unexpected -.endif - -# Adding another level of indirection (the 2 nested :U expressions) helps. -.if ${value:L:${:U${:US}${:U,value,replacement,}}} != "replacement" -. warning unexpected -.endif - -# Multiple indirect modifiers can be applied one after another as long as -# they are separated with colons. -.if ${value:L:${:US,a,A,}:${:US,e,E,}} != "vAluE" -. warning unexpected -.endif - -# An indirect variable that evaluates to the empty string is allowed though. -# This makes it possible to define conditional modifiers, like this: -# -# M.little-endian= S,1234,4321, -# M.big-endian= # none -.if ${value:L:${:Dempty}S,a,A,} != "vAlue" -. warning unexpected -.endif - diff --git a/unit-tests/opt-chdir.exp b/unit-tests/opt-chdir.exp index d20f9eb2f07b..d9759cf9ed8b 100644 --- a/unit-tests/opt-chdir.exp +++ b/unit-tests/opt-chdir.exp @@ -1,6 +1,6 @@ make: chdir /./././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././: File name too long -*** Error code 1 (ignored) +*** Error code 2 (ignored) cwd: / make: chdir /nonexistent: No such file or directory -*** Error code 1 (ignored) +*** Error code 2 (ignored) exit status 0 diff --git a/unit-tests/opt-debug-errors.exp b/unit-tests/opt-debug-errors.exp index dd13e66526b0..859a431f23bb 100644 --- a/unit-tests/opt-debug-errors.exp +++ b/unit-tests/opt-debug-errors.exp @@ -1,34 +1,37 @@ echo '3 spaces'; false 3 spaces *** Failed target: fail-spaces *** Failed command: echo '3 spaces'; false *** Error code 1 (continuing) echo \ indented; false indented *** Failed target: fail-escaped-space *** Failed command: echo \ indented; false *** Error code 1 (continuing) echo 'line1 line2'; false line1 line2 *** Failed target: fail-newline *** Failed command: echo 'line1 line2'; false *** Error code 1 (continuing) echo 'line1 line2'; false line1 line2 *** Failed target: fail-multiline *** Failed command: echo 'line1 line2'; false *** Error code 1 (continuing) echo 'word1' 'word2'; false word1 word2 *** Failed target: fail-multiline-intention *** Failed command: echo 'word1' 'word2'; false *** Error code 1 (continuing) `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/opt-debug-graph1.exp b/unit-tests/opt-debug-graph1.exp index db8367c6f250..45f403f75f1b 100644 --- a/unit-tests/opt-debug-graph1.exp +++ b/unit-tests/opt-debug-graph1.exp @@ -1,17 +1,53 @@ #*** Input graph: # all, made UNMADE, type OP_DEPENDS|OP_HAS_COMMANDS, flags none # made-target, made UNMADE, type OP_DEPENDS, flags none # made-target-no-sources, made UNMADE, type OP_DEPENDS, flags none # made-source, made UNMADE, type OP_DEPENDS, flags none # unmade-target, made UNMADE, type OP_DEPENDS, flags none # unmade-sources, made UNMADE, type none, flags none # unmade-silent-source, made UNMADE, type OP_SILENT, flags none # unmade-target-no-sources, made UNMADE, type OP_DEPENDS, flags none # # Files that are only sources: # unmade-sources [unmade-sources] # unmade-silent-source [unmade-silent-source] .SILENT +#*** Global Variables: +.ALLTARGETS = all made-target made-target-no-sources made-source unmade-target unmade-sources unmade-silent-source unmade-target-no-sources +.CURDIR = +.INCLUDES = +.LIBS = +.MAKE =
+.MAKE.DEPENDFILE =
+.MAKE.GID =
+.MAKE.LEVEL =
+.MAKE.MAKEFILES =
+.MAKE.MAKEFILE_PREFERENCE =
+.MAKE.OS =
+.MAKE.PID =
+.MAKE.PPID =
+.MAKE.UID =
+.MAKEFLAGS = -r -k -d g1 +.MAKEOVERRIDES = +.OBJDIR = +.PATH = . +.TARGETS = +.newline = + +MACHINE =
+MACHINE_ARCH =
+MAKE =
+MFLAGS = -r -k -d g1 +#*** Command-line Variables: +.MAKE.LEVEL.ENV = MAKELEVEL + +#*** Directory Cache: +# Stats: 0 hits 2 misses 0 near misses 0 losers (0%) +# refs hits directory +# 1 0 +# 1 0 . + +#*** Suffixes: #*** Transformations: exit status 0 diff --git a/unit-tests/opt-debug-jobs.exp b/unit-tests/opt-debug-jobs.exp index 0431867756a1..e79d8e94a952 100644 --- a/unit-tests/opt-debug-jobs.exp +++ b/unit-tests/opt-debug-jobs.exp @@ -1,27 +1,27 @@ job_pipe -1 -1, maxjobs 1, tokens 1, compat 0 Job_TokenWithdraw(): aborting 0, running 0 () withdrew token echo ": expanded expression" { : expanded expression } || exit $? echo ": variable" { : variable } || exit $? echo ": 'single' and \"double\" quotes" { : 'single' and "double" quotes } || exit $? { sleep 1 } || exit $? Running all - Command: sh + Command: JobExec(all): pid added to jobs table job table @ job started -job 0, status 3, flags 0, pid +job 0, status 3, flags ---, pid : expanded expression : variable : 'single' and "double" quotes Process exited/stopped status 0. JobFinish: [all], status 0 Job_TokenWithdraw(): aborting 0, running 0 () withdrew token exit status 0 diff --git a/unit-tests/opt-debug-lint.exp b/unit-tests/opt-debug-lint.exp index b0be460848fd..f2123f20e37f 100644 --- a/unit-tests/opt-debug-lint.exp +++ b/unit-tests/opt-debug-lint.exp @@ -1,9 +1,8 @@ make: "opt-debug-lint.mk" line 19: Variable "X" is undefined make: "opt-debug-lint.mk" line 41: Variable "UNDEF" is undefined make: "opt-debug-lint.mk" line 61: Missing delimiter ':' after modifier "L" make: "opt-debug-lint.mk" line 61: Missing delimiter ':' after modifier "P" -make: "opt-debug-lint.mk" line 67: Missing delimiter ':' after indirect modifier "${:UL}" -make: Unknown modifier '$' +make: "opt-debug-lint.mk" line 69: Unknown modifier '$' make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/opt-debug-lint.mk b/unit-tests/opt-debug-lint.mk index 9075243208b1..bb1b38feb717 100644 --- a/unit-tests/opt-debug-lint.mk +++ b/unit-tests/opt-debug-lint.mk @@ -1,72 +1,81 @@ -# $NetBSD: opt-debug-lint.mk,v 1.11 2020/10/24 08:50:17 rillig Exp $ +# $NetBSD: opt-debug-lint.mk,v 1.12 2020/12/20 19:10:53 rillig Exp $ # # Tests for the -dL command line option, which runs additional checks # to catch common mistakes, such as unclosed variable expressions. .MAKEFLAGS: -dL # Since 2020-09-13, undefined variables that are used on the left-hand side # of a condition at parse time get a proper error message. Before, the # error message was "Malformed conditional" only, which was wrong and # misleading. The form of the condition is totally fine, it's the evaluation # that fails. # # Since 2020-09-13, the "Malformed conditional" error message is not printed # anymore. # # See also: # cond-undef-lint.mk .if $X . error .endif # The dynamic variables like .TARGET are treated specially. It does not make # sense to expand them in the global scope since they will never be defined # there under normal circumstances. Therefore they expand to a string that # will later be expanded correctly, when the variable is evaluated again in # the scope of an actual target. # # Even though the "@" variable is not defined at this point, this is not an # error. In all practical cases, this is no problem. This particular test # case is made up and unrealistic. .if $@ != "\$(.TARGET)" . error .endif # Since 2020-09-13, Var_Parse properly reports errors for undefined variables, # but only in lint mode. Before, it had only silently returned var_Error, # hoping for the caller to print an error message. This resulted in the # well-known "Malformed conditional" error message, even though the # conditional was well-formed and the only error was an undefined variable. .if ${UNDEF} . error .endif # Since 2020-09-14, dependency lines may contain undefined variables. # Before, undefined variables were forbidden, but this distinction was not # observable from the outside of the function Var_Parse. ${UNDEF}: ${UNDEF} # In a condition that has a defined(UNDEF) guard, all guarded conditions # may assume that the variable is defined since they will only be evaluated # if the variable is indeed defined. Otherwise they are only parsed, and # for parsing it doesn't make a difference whether the variable is defined # or not. .if defined(UNDEF) && exists(${UNDEF}) . error .endif # Since 2020-10-03, in lint mode the variable modifier must be separated # by colons. See varparse-mod.mk. .if ${value:LPL} != "value" . error .endif -# Since 2020-10-03, in lint mode the variable modifier must be separated -# by colons. See varparse-mod.mk. +# Between 2020-10-03 and var.c 1.752 from 2020-12-20, in lint mode the +# variable modifier had to be separated by colons. This was wrong though +# since make always fell back trying to parse the indirect modifier as a +# SysV modifier. .if ${value:${:UL}PL} != "LPL}" # FIXME: "LPL}" is unexpected here. . error ${value:${:UL}PL} .endif +# Typically, an indirect modifier is followed by a colon or the closing +# brace. This one isn't, therefore make falls back to parsing it as the SysV +# modifier ":lue=lid". +.if ${value:L:${:Ulue}=${:Ulid}} != "valid" +. error +.endif + all: @:; diff --git a/unit-tests/opt-file.exp b/unit-tests/opt-file.exp index 39a9383953dd..76a832949aca 100644 --- a/unit-tests/opt-file.exp +++ b/unit-tests/opt-file.exp @@ -1 +1,12 @@ -exit status 0 +value +value +line-with-trailing-whitespace +make: "(stdin)" line 1: Zero byte read from file +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +*** Error code 1 (continuing) +`all' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/opt-file.mk b/unit-tests/opt-file.mk index 86bc100bebc2..3ab8ef4e3c7d 100644 --- a/unit-tests/opt-file.mk +++ b/unit-tests/opt-file.mk @@ -1,8 +1,105 @@ -# $NetBSD: opt-file.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: opt-file.mk,v 1.11 2020/12/22 08:57:23 rillig Exp $ # # Tests for the -f command line option. # TODO: Implementation +all: .PHONY +all: file-ending-in-backslash +all: file-ending-in-backslash-mmap +all: line-with-trailing-whitespace +all: file-containing-null-byte + +# Passing '-' as the filename reads from stdin. This is unusual but possible. +# +# In the unlikely case where a file ends in a backslash instead of a newline, +# that backslash is trimmed. See ParseGetLine. +# +# make-2014.01.01.00.00.00 invoked undefined behavior, reading text from +# outside of the file buffer. +# +# printf '%s' 'VAR=value\' \ +# | MALLOC_OPTIONS=JA make-2014.01.01.00.00.00 -r -f - -V VAR -dA 2>&1 \ +# | less +# +# The debug output shows how make happily uses freshly allocated memory (the +# ) and already freed memory ('Z'). +# +# ParseReadLine (1): 'VAR=value\' +# Global:VAR = value\value\ +# ParseReadLine (2): 'alue\' +# ParseDoDependency(alue\) +# make-2014.01.01.00.00.00: "(stdin)" line 2: Need an operator +# ParseReadLine (3): 'ZZZZZZZZZZZZZZZZ' +# ParseDoDependency(ZZZZZZZZZZZZZZZZ) +# +file-ending-in-backslash: .PHONY + @printf '%s' 'VAR=value\' \ + | ${MAKE} -r -f - -V VAR + +# Between parse.c 1.170 from 2010-12-25 and parse.c 1.511 from 2020-12-22, +# there was an out-of-bounds write in ParseGetLine, where line_end pointed at +# the end of the allocated buffer, in the special case where loadedfile_mmap +# had not added the final newline character. +file-ending-in-backslash-mmap: .PHONY + @printf '%s' 'VAR=value\' > opt-file-backslash + @${MAKE} -r -f opt-file-backslash -V VAR + @rm opt-file-backslash + +# Since parse.c 1.511 from 2020-12-22, an assertion in ParseGetLine failed +# for lines that contained trailing whitespace. Worked around in parse.c +# 1.513, properly fixed in parse.c 1.514. +line-with-trailing-whitespace: .PHONY + @printf '%s' 'VAR=$@ ' > opt-file-trailing-whitespace + @${MAKE} -r -f opt-file-trailing-whitespace -V VAR + @rm opt-file-trailing-whitespace + +# If a makefile contains null bytes, it is an error. Throughout the history +# of make, the behavior has changed several times, sometimes intentionally, +# sometimes by accident. +# +# echo 'VAR=value' | tr 'l' '\0' > zero-byte.in +# printf '%s\n' 'all:' ': VAR=${VAR:Q}' >> zero-byte.in +# +# for year in $(seq 2003 2020); do +# echo $year: +# make-$year.01.01.00.00.00 -r -f zero-byte.in +# echo "exit status $?" +# echo +# done 2>&1 \ +# | sed "s,$PWD/,.," +# +# This program generated the following output: +# +# 2003 to 2007: +# exit status 0 +# +# 2008 to 2010: +# make: "zero-byte.in" line 1: Zero byte read from file +# make: Fatal errors encountered -- cannot continue +# +# make: stopped in . +# exit status 1 +# +# 2011 to 2013: +# make: no target to make. +# +# make: stopped in . +# exit status 2 +# +# 2014 to 2020-12-06: +# make: "zero-byte.in" line 1: warning: Zero byte read from file, skipping rest of line. +# exit status 0 +# +# Since 2020-12-07: +# make: "zero-byte.in" line 1: Zero byte read from file +# make: Fatal errors encountered -- cannot continue +# make: stopped in . +# exit status 1 +file-containing-null-byte: .PHONY + @printf '%s\n' 'VAR=value' 'VAR2=VALUE2' \ + | tr 'l' '\0' \ + | ${MAKE} -r -f - -V VAR -V VAR2 + all: - @:; + : Making ${.TARGET} diff --git a/unit-tests/opt-jobs-no-action.exp b/unit-tests/opt-jobs-no-action.exp new file mode 100644 index 000000000000..8556fa3bf943 --- /dev/null +++ b/unit-tests/opt-jobs-no-action.exp @@ -0,0 +1,61 @@ +begin explain +# .echoOff +# .echoTmpl +echo "false regular" +# .runChkTmpl +{ false regular +} || exit $? +# .echoOn +# .runChkTmpl +{ : silent +} || exit $? +# .echoOn +false ignore-errors +echo run despite the -n option +run despite the -n option +end explain + +begin combined + +silent=no always=no ignerr=no +# .echoOff +# .echoTmpl +echo "echo running" +# .runChkTmpl +{ echo running +} || exit $? +# .echoOn + +silent=no always=no ignerr=yes +echo running; false + +silent=no always=yes ignerr=no +echo running +running + +silent=no always=yes ignerr=yes +echo running; false +running +*** Error code 1 (ignored) + +silent=yes always=no ignerr=no +# .runChkTmpl +{ echo running +} || exit $? +# .echoOn + +silent=yes always=no ignerr=yes +echo running; false +# .echoOn + +silent=yes always=yes ignerr=no +echo running +running + +silent=yes always=yes ignerr=yes +echo running; false +running +*** Error code 1 (ignored) + +end combined +exit status 0 diff --git a/unit-tests/opt-jobs-no-action.mk b/unit-tests/opt-jobs-no-action.mk new file mode 100644 index 000000000000..a75fc38cf2fa --- /dev/null +++ b/unit-tests/opt-jobs-no-action.mk @@ -0,0 +1,102 @@ +# $NetBSD: opt-jobs-no-action.mk,v 1.8 2020/12/10 23:54:41 rillig Exp $ +# +# Tests for the combination of the options -j and -n, which prints the +# commands instead of actually running them. +# +# The format of the output differs from the output of only the -n option, +# without the -j. This is because all this code is implemented twice, once +# in compat.c and once in job.c. +# +# See also: +# opt-jobs.mk +# The corresponding tests without the -n option +# opt-no-action-combined.mk +# The corresponding tests without the -j option + +.MAKEFLAGS: -j1 -n + +# Change the templates for running the commands in jobs mode, to make it +# easier to see what actually happens. +# +# The shell attributes are handled by Job_ParseShell. +# The shell attributes 'quiet' and 'echo' don't need a trailing newline, +# this is handled by the [0] != '\0' checks in Job_ParseShell. +# The '\#' is handled by ParseGetLine. +# The '\n' is handled by Str_Words in Job_ParseShell. +# The '$$' is handled by Var_Subst in ParseDependency. +.SHELL: \ + name=sh \ + path=${.SHELL} \ + quiet="\# .echoOff" \ + echo="\# .echoOn" \ + filter="\# .noPrint\n" \ + check="\# .echoTmpl\n""echo \"%s\"\n" \ + ignore="\# .runIgnTmpl\n""%s\n" \ + errout="\# .runChkTmpl\n""{ %s \n} || exit $$?\n" + +all: explained combined +.ORDER: explained combined + +# Explain the most basic cases in detail. +explained: .PHONY + @+echo hide-from-output 'begin explain' + + # The following command is regular, it is printed twice: + # - first using the template shell.echoTmpl, + # - then using the template shell.runChkTmpl. + false regular + + # The following command is silent, it is printed once, using the + # template shell.runChkTmpl. + @: silent + + # The following command ignores errors, it is printed once, using + # the default template for cmdTemplate, which is "%s\n". + # XXX: Why is it not printed using shell.echoTmpl as well? + # XXX: The '-' should not influence the echoing of the command. + -false ignore-errors + + # The following command ignores the -n command line option, it is + # not handled by the Job module but by the Compat module, see the + # '!silent' in Compat_RunCommand. + +echo run despite the -n option + + @+echo hide-from-output 'end explain' + @+echo hide-from-output + + +# Test all combinations of the 3 RunFlags. +# +# TODO: Closely inspect the output whether it makes sense. +# XXX: silent=no always=no ignerr={no,yes} should be almost the same. +# +SILENT.no= # none +SILENT.yes= @ +ALWAYS.no= # none +ALWAYS.yes= + +IGNERR.no= echo running +IGNERR.yes= -echo running; false +# +combined: combined-begin + +combined-begin: .PHONY + @+echo hide-from-output 'begin combined' + @+echo hide-from-output + +.for silent in no yes +. for always in no yes +. for ignerr in no yes +. for target in combined-silent-${silent}-always-${always}-ignerr-${ignerr} +combined: .WAIT ${target} .WAIT +${target}: .PHONY + @+echo hide-from-output silent=${silent} always=${always} ignerr=${ignerr} + ${SILENT.${silent}}${ALWAYS.${always}}${IGNERR.${ignerr}} + @+echo hide-from-output +. endfor +. endfor +. endfor +.endfor + +combined: combined-end +combined-end: .PHONY + @+echo hide-from-output 'end combined' diff --git a/unit-tests/varname-make_print_var_on_error.exp b/unit-tests/opt-keep-going-multiple.exp similarity index 54% copy from unit-tests/varname-make_print_var_on_error.exp copy to unit-tests/opt-keep-going-multiple.exp index e2f6a429a9fc..6d1bec18977b 100644 --- a/unit-tests/varname-make_print_var_on_error.exp +++ b/unit-tests/opt-keep-going-multiple.exp @@ -1,8 +1,9 @@ -fail +false fail1 *** Error code 1 (continuing) +false fail2 +*** Error code 1 (continuing) +true succeed Stop. make: stopped in unit-tests -.ERROR_TARGET='all' -.ERROR_CMD='' exit status 1 diff --git a/unit-tests/opt-keep-going-multiple.mk b/unit-tests/opt-keep-going-multiple.mk new file mode 100644 index 000000000000..cc08ccfb82c3 --- /dev/null +++ b/unit-tests/opt-keep-going-multiple.mk @@ -0,0 +1,21 @@ +# $NetBSD: opt-keep-going-multiple.mk,v 1.1 2020/12/07 01:32:04 rillig Exp $ +# +# Tests for the -k command line option, which stops building a target as soon +# as an error is detected, but continues building the other, independent +# targets, as far as possible. +# +# Until 2020-12-07, the exit status of make depended only on the last of the +# main targets. Even if the first few targets could not be made, make +# nevertheless exited with status 0. + +.MAKEFLAGS: -k +.MAKEFLAGS: fail1 fail2 succeed + +fail1 fail2: .PHONY + false ${.TARGET} + +succeed: .PHONY + true ${.TARGET} + +.END: + : The end. diff --git a/unit-tests/opt-keep-going.exp b/unit-tests/opt-keep-going.exp index cdad54ac24f8..2dbeb9927a30 100644 --- a/unit-tests/opt-keep-going.exp +++ b/unit-tests/opt-keep-going.exp @@ -1,6 +1,9 @@ dependency 1 *** Error code 1 (continuing) other 1 *** Error code 1 (continuing) `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/opt-keep-going.mk b/unit-tests/opt-keep-going.mk index 72f605246712..8a5e079ef406 100644 --- a/unit-tests/opt-keep-going.mk +++ b/unit-tests/opt-keep-going.mk @@ -1,27 +1,31 @@ -# $NetBSD: opt-keep-going.mk,v 1.5 2020/11/09 20:50:56 rillig Exp $ +# $NetBSD: opt-keep-going.mk,v 1.6 2020/12/07 00:53:30 rillig Exp $ # # Tests for the -k command line option, which stops building a target as soon # as an error is detected, but continues building the other, independent # targets, as far as possible. +# +# Until 2020-12-07, if a dependency of the main target failed, the exit +# status was nevertheless 0, which was wrong since the main targets could +# not be made. This was only wrong in -k mode combined with compat mode. .MAKEFLAGS: -d0 # switch stdout to being line-buffered .MAKEFLAGS: -k all: dependency other dependency: @echo dependency 1 @false @echo dependency 2 @:; exit 7 @echo dependency 3 other: @echo other 1 @false @echo other 2 all: @echo main 1 @false @echo main 2 diff --git a/unit-tests/opt-no-action-runflags.exp b/unit-tests/opt-no-action-runflags.exp new file mode 100644 index 000000000000..33b311228927 --- /dev/null +++ b/unit-tests/opt-no-action-runflags.exp @@ -0,0 +1,34 @@ +begin combined + +silent=no always=no ignerr=no +echo running + +silent=no always=no ignerr=yes +echo running; false + +silent=no always=yes ignerr=no +echo running +running + +silent=no always=yes ignerr=yes +echo running; false +running +*** Error code 1 (ignored) + +silent=yes always=no ignerr=no +echo running + +silent=yes always=no ignerr=yes +echo running; false + +silent=yes always=yes ignerr=no +echo running +running + +silent=yes always=yes ignerr=yes +echo running; false +running +*** Error code 1 (ignored) + +end combined +exit status 0 diff --git a/unit-tests/opt-no-action-runflags.mk b/unit-tests/opt-no-action-runflags.mk new file mode 100644 index 000000000000..61ae7b2bf319 --- /dev/null +++ b/unit-tests/opt-no-action-runflags.mk @@ -0,0 +1,32 @@ +# $NetBSD: opt-no-action-runflags.mk,v 1.1 2020/12/09 07:57:52 rillig Exp $ +# +# Tests for the -n command line option, which runs almost no commands, +# combined with the RunFlags '@', '-', '+' for individual commands. +# +# See also: +# opt-jobs-no-action.mk +# The corresponding test with the -j option + +.MAKEFLAGS: -n + +all: .PHONY combined + +SILENT.no= # none +SILENT.yes= @ +ALWAYS.no= # none +ALWAYS.yes= + +IGNERR.no= echo running +IGNERR.yes= -echo running; false +# +combined: .PHONY + @+echo hide-from-output 'begin $@'; echo +.for silent in no yes +. for always in no yes +. for ignerr in no yes + @+echo hide-from-output silent=${silent} always=${always} ignerr=${ignerr} + ${SILENT.${silent}}${ALWAYS.${always}}${IGNERR.${ignerr}} + @+echo hide-from-output +. endfor +. endfor +.endfor + @+echo hide-from-output 'end $@' diff --git a/unit-tests/opt.exp b/unit-tests/opt.exp index 11344ae0c359..3c96cf25025f 100644 --- a/unit-tests/opt.exp +++ b/unit-tests/opt.exp @@ -1,22 +1,26 @@ make -r -f /dev/null -V MAKEFLAGS -r -k -d 0 make -: usage: make [-BeikNnqrSstWwX] [-C directory] [-D variable] [-d flags] [-f makefile] [-I directory] [-J private] [-j max_jobs] [-m directory] [-T file] [-V variable] [-v variable] [variable=value] [target ...] *** Error code 2 (ignored) make -r -f /dev/null -- -VAR=value -f /dev/null make: don't know how to make -f (continuing) `/dev/null' is up to date. +Stop. +make: stopped in unit-tests +*** Error code 1 (ignored) + make -? usage: make [-BeikNnqrSstWwX] [-C directory] [-D variable] [-d flags] [-f makefile] [-I directory] [-J private] [-j max_jobs] [-m directory] [-T file] [-V variable] [-v variable] [variable=value] [target ...] *** Error code 2 (ignored) exit status 0 diff --git a/unit-tests/posix.exp b/unit-tests/posix.exp index 7e74cabadfb5..01961f363f59 100644 --- a/unit-tests/posix.exp +++ b/unit-tests/posix.exp @@ -1,23 +1,26 @@ Posix says we should execute the command as if run by system(3) Expect 'Hello,' and 'World!' Hello, World! a command a command prefixed by '+' executes even with -n another command make -n echo a command echo "a command prefixed by '+' executes even with -n" a command prefixed by '+' executes even with -n echo another command make -n -j1 { echo a command } || exit $? echo "a command prefixed by '+' executes even with -n" a command prefixed by '+' executes even with -n { echo another command } || exit $? Now we expect an error... *** Error code 1 (continuing) `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/qequals.exp b/unit-tests/qequals.exp deleted file mode 100644 index 6b2f4dce6994..000000000000 --- a/unit-tests/qequals.exp +++ /dev/null @@ -1,2 +0,0 @@ -V.i386 ?= OK -exit status 0 diff --git a/unit-tests/qequals.mk b/unit-tests/qequals.mk deleted file mode 100644 index a964e99b2645..000000000000 --- a/unit-tests/qequals.mk +++ /dev/null @@ -1,8 +0,0 @@ -# $NetBSD: qequals.mk,v 1.3 2020/10/24 08:50:17 rillig Exp $ - -M= i386 -V.i386= OK -V.$M?= bug - -all: - @echo 'V.$M ?= ${V.$M}' diff --git a/unit-tests/sh-dots.exp b/unit-tests/sh-dots.exp index 4d935096c48a..a7de932035f3 100755 --- a/unit-tests/sh-dots.exp +++ b/unit-tests/sh-dots.exp @@ -1,22 +1,22 @@ first first hidden hidden -make: exec(...) failed (No such file or directory) -*** Error code 1 (ignored) + +*** Error code (ignored) hidden delayed hidden repeated repeated commented commented ... # Run the below commands later - -*** Error code 127 (ignored) + +*** Error code (ignored) commented delayed commented indirect regular indirect-space regular ... -make: exec(...) failed (No such file or directory) -*** Error code 1 (ignored) + +*** Error code (ignored) indirect-space deferred first delayed first repeated delayed repeated repeated delayed twice repeated indirect deferred exit status 0 diff --git a/unit-tests/sh-errctl.exp b/unit-tests/sh-errctl.exp new file mode 100644 index 000000000000..8e6bc3c82125 --- /dev/null +++ b/unit-tests/sh-errctl.exp @@ -0,0 +1,27 @@ +job_pipe -1 -1, maxjobs 1, tokens 1, compat 0 +Job_TokenWithdraw(): aborting 0, running 0 +() withdrew token +# echo off +echo silent +# echo on +# echo off +# error checking off +set +e +# echo on +echo ignerr; false +# echo off +# error checking on +set -e +# echo on +echo always +Running all + Command: +JobExec(all): pid added to jobs table +job table @ job started +job 0, status 3, flags ---, pid +silent +ignerr +always +Job_TokenWithdraw(): aborting 0, running 0 +() withdrew token +exit status 0 diff --git a/unit-tests/sh-errctl.mk b/unit-tests/sh-errctl.mk new file mode 100644 index 000000000000..ecc2485e9b72 --- /dev/null +++ b/unit-tests/sh-errctl.mk @@ -0,0 +1,26 @@ +# $NetBSD: sh-errctl.mk,v 1.1 2020/12/12 15:06:11 rillig Exp $ +# +# Test a shell with error control. This only works in jobs mode; in compat +# mode, the default shell is always used, see InitShellNameAndPath. +# +# There is a subtle difference between error control and echo control. +# With error control, each simple command is checked, whereas with echo +# control, only the last command from each line is checked. A shell command +# line that behaves differently in these two modes is "false; true". In +# error control mode, this fails, while in echo control mode, it succeeds. + +.MAKEFLAGS: -j1 -dj + +.SHELL: \ + name="sh" \ + path="${.SHELL}" \ + hasErrCtl="yes" \ + check="\# error checking on\nset -e" \ + ignore="\# error checking off\nset +e" \ + echo="\# echo on" \ + quiet="\# echo off" + +all: + @echo silent + -echo ignerr; false + +echo always diff --git a/unit-tests/sh-flags.exp b/unit-tests/sh-flags.exp new file mode 100644 index 000000000000..2fec7de2dd99 --- /dev/null +++ b/unit-tests/sh-flags.exp @@ -0,0 +1,4325 @@ + +opt-______-tgt-___-cmd-___ +echo running +running + +opt-______-tgt-___-cmd-__s +running + +opt-______-tgt-___-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-___-cmd-_is +running +*** Error code 1 (ignored) + +opt-______-tgt-___-cmd-a__ +echo running +running + +opt-______-tgt-___-cmd-a_s +running + +opt-______-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-___-cmd-ais +running +*** Error code 1 (ignored) + +opt-______-tgt-__s-cmd-___ +running + +opt-______-tgt-__s-cmd-__s +running + +opt-______-tgt-__s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-______-tgt-__s-cmd-_is +running +*** Error code 1 (ignored) + +opt-______-tgt-__s-cmd-a__ +running + +opt-______-tgt-__s-cmd-a_s +running + +opt-______-tgt-__s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-______-tgt-__s-cmd-ais +running +*** Error code 1 (ignored) + +opt-______-tgt-_i_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-_i_-cmd-__s +running +*** Error code 1 (ignored) + +opt-______-tgt-_i_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-_i_-cmd-_is +running +*** Error code 1 (ignored) + +opt-______-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-_i_-cmd-a_s +running +*** Error code 1 (ignored) + +opt-______-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-_i_-cmd-ais +running +*** Error code 1 (ignored) + +opt-______-tgt-_is-cmd-___ +running +*** Error code 1 (ignored) + +opt-______-tgt-_is-cmd-__s +running +*** Error code 1 (ignored) + +opt-______-tgt-_is-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-______-tgt-_is-cmd-_is +running +*** Error code 1 (ignored) + +opt-______-tgt-_is-cmd-a__ +running +*** Error code 1 (ignored) + +opt-______-tgt-_is-cmd-a_s +running +*** Error code 1 (ignored) + +opt-______-tgt-_is-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-______-tgt-_is-cmd-ais +running +*** Error code 1 (ignored) + +opt-______-tgt-a__-cmd-___ +echo running +running + +opt-______-tgt-a__-cmd-__s +running + +opt-______-tgt-a__-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-a__-cmd-_is +running +*** Error code 1 (ignored) + +opt-______-tgt-a__-cmd-a__ +echo running +running + +opt-______-tgt-a__-cmd-a_s +running + +opt-______-tgt-a__-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-a__-cmd-ais +running +*** Error code 1 (ignored) + +opt-______-tgt-a_s-cmd-___ +running + +opt-______-tgt-a_s-cmd-__s +running + +opt-______-tgt-a_s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-______-tgt-a_s-cmd-_is +running +*** Error code 1 (ignored) + +opt-______-tgt-a_s-cmd-a__ +running + +opt-______-tgt-a_s-cmd-a_s +running + +opt-______-tgt-a_s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-______-tgt-a_s-cmd-ais +running +*** Error code 1 (ignored) + +opt-______-tgt-ai_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-ai_-cmd-__s +running +*** Error code 1 (ignored) + +opt-______-tgt-ai_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-ai_-cmd-_is +running +*** Error code 1 (ignored) + +opt-______-tgt-ai_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-ai_-cmd-a_s +running +*** Error code 1 (ignored) + +opt-______-tgt-ai_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-______-tgt-ai_-cmd-ais +running +*** Error code 1 (ignored) + +opt-______-tgt-ais-cmd-___ +running +*** Error code 1 (ignored) + +opt-______-tgt-ais-cmd-__s +running +*** Error code 1 (ignored) + +opt-______-tgt-ais-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-______-tgt-ais-cmd-_is +running +*** Error code 1 (ignored) + +opt-______-tgt-ais-cmd-a__ +running +*** Error code 1 (ignored) + +opt-______-tgt-ais-cmd-a_s +running +*** Error code 1 (ignored) + +opt-______-tgt-ais-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-______-tgt-ais-cmd-ais +running +*** Error code 1 (ignored) + +opt-___n__-tgt-___-cmd-___ +echo running + +opt-___n__-tgt-___-cmd-__s +echo running + +opt-___n__-tgt-___-cmd-_i_ +echo running; false + +opt-___n__-tgt-___-cmd-_is +echo running; false + +opt-___n__-tgt-___-cmd-a__ +echo running +running + +opt-___n__-tgt-___-cmd-a_s +echo running +running + +opt-___n__-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-__s-cmd-___ +echo running + +opt-___n__-tgt-__s-cmd-__s +echo running + +opt-___n__-tgt-__s-cmd-_i_ +echo running; false + +opt-___n__-tgt-__s-cmd-_is +echo running; false + +opt-___n__-tgt-__s-cmd-a__ +echo running +running + +opt-___n__-tgt-__s-cmd-a_s +echo running +running + +opt-___n__-tgt-__s-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-_i_-cmd-___ +echo running; false + +opt-___n__-tgt-_i_-cmd-__s +echo running; false + +opt-___n__-tgt-_i_-cmd-_i_ +echo running; false + +opt-___n__-tgt-_i_-cmd-_is +echo running; false + +opt-___n__-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-_is-cmd-___ +echo running; false + +opt-___n__-tgt-_is-cmd-__s +echo running; false + +opt-___n__-tgt-_is-cmd-_i_ +echo running; false + +opt-___n__-tgt-_is-cmd-_is +echo running; false + +opt-___n__-tgt-_is-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-_is-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-a__-cmd-___ +echo running +running + +opt-___n__-tgt-a__-cmd-__s +running + +opt-___n__-tgt-a__-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-a__-cmd-_is +running +*** Error code 1 (ignored) + +opt-___n__-tgt-a__-cmd-a__ +echo running +running + +opt-___n__-tgt-a__-cmd-a_s +running + +opt-___n__-tgt-a__-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-a__-cmd-ais +running +*** Error code 1 (ignored) + +opt-___n__-tgt-a_s-cmd-___ +running + +opt-___n__-tgt-a_s-cmd-__s +running + +opt-___n__-tgt-a_s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-___n__-tgt-a_s-cmd-_is +running +*** Error code 1 (ignored) + +opt-___n__-tgt-a_s-cmd-a__ +running + +opt-___n__-tgt-a_s-cmd-a_s +running + +opt-___n__-tgt-a_s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-___n__-tgt-a_s-cmd-ais +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ai_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ai_-cmd-__s +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ai_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ai_-cmd-_is +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ai_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ai_-cmd-a_s +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ai_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ai_-cmd-ais +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ais-cmd-___ +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ais-cmd-__s +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ais-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ais-cmd-_is +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ais-cmd-a__ +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ais-cmd-a_s +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ais-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-___n__-tgt-ais-cmd-ais +running +*** Error code 1 (ignored) + +opt-__l___-tgt-___-cmd-___ +echo running +running + +opt-__l___-tgt-___-cmd-__s +echo running +running + +opt-__l___-tgt-___-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-___-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-___-cmd-a__ +echo running +running + +opt-__l___-tgt-___-cmd-a_s +echo running +running + +opt-__l___-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-__s-cmd-___ +running + +opt-__l___-tgt-__s-cmd-__s +echo running +running + +opt-__l___-tgt-__s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-__s-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-__s-cmd-a__ +running + +opt-__l___-tgt-__s-cmd-a_s +echo running +running + +opt-__l___-tgt-__s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_i_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_i_-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_i_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_i_-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_is-cmd-___ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_is-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_is-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_is-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_is-cmd-a__ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_is-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-a__-cmd-___ +echo running +running + +opt-__l___-tgt-a__-cmd-__s +echo running +running + +opt-__l___-tgt-a__-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-a__-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-a__-cmd-a__ +echo running +running + +opt-__l___-tgt-a__-cmd-a_s +echo running +running + +opt-__l___-tgt-a__-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-a__-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-a_s-cmd-___ +running + +opt-__l___-tgt-a_s-cmd-__s +echo running +running + +opt-__l___-tgt-a_s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-a_s-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-a_s-cmd-a__ +running + +opt-__l___-tgt-a_s-cmd-a_s +echo running +running + +opt-__l___-tgt-a_s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-a_s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ai_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ai_-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ai_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ai_-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ai_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ai_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ai_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ai_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ais-cmd-___ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ais-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ais-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ais-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ais-cmd-a__ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ais-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ais-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-__l___-tgt-ais-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-___-cmd-___ +echo running + +opt-__ln__-tgt-___-cmd-__s +echo running + +opt-__ln__-tgt-___-cmd-_i_ +echo running; false + +opt-__ln__-tgt-___-cmd-_is +echo running; false + +opt-__ln__-tgt-___-cmd-a__ +echo running +running + +opt-__ln__-tgt-___-cmd-a_s +echo running +running + +opt-__ln__-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-__s-cmd-___ +echo running + +opt-__ln__-tgt-__s-cmd-__s +echo running + +opt-__ln__-tgt-__s-cmd-_i_ +echo running; false + +opt-__ln__-tgt-__s-cmd-_is +echo running; false + +opt-__ln__-tgt-__s-cmd-a__ +echo running +running + +opt-__ln__-tgt-__s-cmd-a_s +echo running +running + +opt-__ln__-tgt-__s-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-_i_-cmd-___ +echo running; false + +opt-__ln__-tgt-_i_-cmd-__s +echo running; false + +opt-__ln__-tgt-_i_-cmd-_i_ +echo running; false + +opt-__ln__-tgt-_i_-cmd-_is +echo running; false + +opt-__ln__-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-_is-cmd-___ +echo running; false + +opt-__ln__-tgt-_is-cmd-__s +echo running; false + +opt-__ln__-tgt-_is-cmd-_i_ +echo running; false + +opt-__ln__-tgt-_is-cmd-_is +echo running; false + +opt-__ln__-tgt-_is-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-_is-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-a__-cmd-___ +echo running +running + +opt-__ln__-tgt-a__-cmd-__s +echo running +running + +opt-__ln__-tgt-a__-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-a__-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-a__-cmd-a__ +echo running +running + +opt-__ln__-tgt-a__-cmd-a_s +echo running +running + +opt-__ln__-tgt-a__-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-a__-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-a_s-cmd-___ +running + +opt-__ln__-tgt-a_s-cmd-__s +echo running +running + +opt-__ln__-tgt-a_s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-a_s-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-a_s-cmd-a__ +running + +opt-__ln__-tgt-a_s-cmd-a_s +echo running +running + +opt-__ln__-tgt-a_s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-a_s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ai_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ai_-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ai_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ai_-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ai_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ai_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ai_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ai_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ais-cmd-___ +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ais-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ais-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ais-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ais-cmd-a__ +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ais-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ais-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-__ln__-tgt-ais-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_j____-tgt-___-cmd-___ +echo running +running + +opt-_j____-tgt-___-cmd-__s +running + +opt-_j____-tgt-___-cmd-_i_ +echo running; false +running +*** [opt-_j____-tgt-___-cmd-_i_] Error code 1 (ignored) + +opt-_j____-tgt-___-cmd-_is +running +*** [opt-_j____-tgt-___-cmd-_is] Error code 1 (ignored) + +opt-_j____-tgt-___-cmd-a__ +echo running +running + +opt-_j____-tgt-___-cmd-a_s +running + +opt-_j____-tgt-___-cmd-ai_ +echo running; false +running +*** [opt-_j____-tgt-___-cmd-ai_] Error code 1 (ignored) + +opt-_j____-tgt-___-cmd-ais +running +*** [opt-_j____-tgt-___-cmd-ais] Error code 1 (ignored) + +opt-_j____-tgt-__s-cmd-___ +running + +opt-_j____-tgt-__s-cmd-__s +running + +opt-_j____-tgt-__s-cmd-_i_ +echo running; false +running +*** [opt-_j____-tgt-__s-cmd-_i_] Error code 1 (ignored) + +opt-_j____-tgt-__s-cmd-_is +running +*** [opt-_j____-tgt-__s-cmd-_is] Error code 1 (ignored) + +opt-_j____-tgt-__s-cmd-a__ +running + +opt-_j____-tgt-__s-cmd-a_s +running + +opt-_j____-tgt-__s-cmd-ai_ +echo running; false +running +*** [opt-_j____-tgt-__s-cmd-ai_] Error code 1 (ignored) + +opt-_j____-tgt-__s-cmd-ais +running +*** [opt-_j____-tgt-__s-cmd-ais] Error code 1 (ignored) + +opt-_j____-tgt-_i_-cmd-___ +echo running; false +running +*** [opt-_j____-tgt-_i_-cmd-___] Error code 1 (ignored) + +opt-_j____-tgt-_i_-cmd-__s +running +*** [opt-_j____-tgt-_i_-cmd-__s] Error code 1 (ignored) + +opt-_j____-tgt-_i_-cmd-_i_ +echo running; false +running +*** [opt-_j____-tgt-_i_-cmd-_i_] Error code 1 (ignored) + +opt-_j____-tgt-_i_-cmd-_is +running +*** [opt-_j____-tgt-_i_-cmd-_is] Error code 1 (ignored) + +opt-_j____-tgt-_i_-cmd-a__ +echo running; false +running +*** [opt-_j____-tgt-_i_-cmd-a__] Error code 1 (ignored) + +opt-_j____-tgt-_i_-cmd-a_s +running +*** [opt-_j____-tgt-_i_-cmd-a_s] Error code 1 (ignored) + +opt-_j____-tgt-_i_-cmd-ai_ +echo running; false +running +*** [opt-_j____-tgt-_i_-cmd-ai_] Error code 1 (ignored) + +opt-_j____-tgt-_i_-cmd-ais +running +*** [opt-_j____-tgt-_i_-cmd-ais] Error code 1 (ignored) + +opt-_j____-tgt-_is-cmd-___ +running +*** [opt-_j____-tgt-_is-cmd-___] Error code 1 (ignored) + +opt-_j____-tgt-_is-cmd-__s +running +*** [opt-_j____-tgt-_is-cmd-__s] Error code 1 (ignored) + +opt-_j____-tgt-_is-cmd-_i_ +echo running; false +running +*** [opt-_j____-tgt-_is-cmd-_i_] Error code 1 (ignored) + +opt-_j____-tgt-_is-cmd-_is +running +*** [opt-_j____-tgt-_is-cmd-_is] Error code 1 (ignored) + +opt-_j____-tgt-_is-cmd-a__ +running +*** [opt-_j____-tgt-_is-cmd-a__] Error code 1 (ignored) + +opt-_j____-tgt-_is-cmd-a_s +running +*** [opt-_j____-tgt-_is-cmd-a_s] Error code 1 (ignored) + +opt-_j____-tgt-_is-cmd-ai_ +echo running; false +running +*** [opt-_j____-tgt-_is-cmd-ai_] Error code 1 (ignored) + +opt-_j____-tgt-_is-cmd-ais +running +*** [opt-_j____-tgt-_is-cmd-ais] Error code 1 (ignored) + +opt-_j____-tgt-a__-cmd-___ +echo running +running + +opt-_j____-tgt-a__-cmd-__s +running + +opt-_j____-tgt-a__-cmd-_i_ +echo running; false +running +*** [opt-_j____-tgt-a__-cmd-_i_] Error code 1 (ignored) + +opt-_j____-tgt-a__-cmd-_is +running +*** [opt-_j____-tgt-a__-cmd-_is] Error code 1 (ignored) + +opt-_j____-tgt-a__-cmd-a__ +echo running +running + +opt-_j____-tgt-a__-cmd-a_s +running + +opt-_j____-tgt-a__-cmd-ai_ +echo running; false +running +*** [opt-_j____-tgt-a__-cmd-ai_] Error code 1 (ignored) + +opt-_j____-tgt-a__-cmd-ais +running +*** [opt-_j____-tgt-a__-cmd-ais] Error code 1 (ignored) + +opt-_j____-tgt-a_s-cmd-___ +running + +opt-_j____-tgt-a_s-cmd-__s +running + +opt-_j____-tgt-a_s-cmd-_i_ +echo running; false +running +*** [opt-_j____-tgt-a_s-cmd-_i_] Error code 1 (ignored) + +opt-_j____-tgt-a_s-cmd-_is +running +*** [opt-_j____-tgt-a_s-cmd-_is] Error code 1 (ignored) + +opt-_j____-tgt-a_s-cmd-a__ +running + +opt-_j____-tgt-a_s-cmd-a_s +running + +opt-_j____-tgt-a_s-cmd-ai_ +echo running; false +running +*** [opt-_j____-tgt-a_s-cmd-ai_] Error code 1 (ignored) + +opt-_j____-tgt-a_s-cmd-ais +running +*** [opt-_j____-tgt-a_s-cmd-ais] Error code 1 (ignored) + +opt-_j____-tgt-ai_-cmd-___ +echo running; false +running +*** [opt-_j____-tgt-ai_-cmd-___] Error code 1 (ignored) + +opt-_j____-tgt-ai_-cmd-__s +running +*** [opt-_j____-tgt-ai_-cmd-__s] Error code 1 (ignored) + +opt-_j____-tgt-ai_-cmd-_i_ +echo running; false +running +*** [opt-_j____-tgt-ai_-cmd-_i_] Error code 1 (ignored) + +opt-_j____-tgt-ai_-cmd-_is +running +*** [opt-_j____-tgt-ai_-cmd-_is] Error code 1 (ignored) + +opt-_j____-tgt-ai_-cmd-a__ +echo running; false +running +*** [opt-_j____-tgt-ai_-cmd-a__] Error code 1 (ignored) + +opt-_j____-tgt-ai_-cmd-a_s +running +*** [opt-_j____-tgt-ai_-cmd-a_s] Error code 1 (ignored) + +opt-_j____-tgt-ai_-cmd-ai_ +echo running; false +running +*** [opt-_j____-tgt-ai_-cmd-ai_] Error code 1 (ignored) + +opt-_j____-tgt-ai_-cmd-ais +running +*** [opt-_j____-tgt-ai_-cmd-ais] Error code 1 (ignored) + +opt-_j____-tgt-ais-cmd-___ +running +*** [opt-_j____-tgt-ais-cmd-___] Error code 1 (ignored) + +opt-_j____-tgt-ais-cmd-__s +running +*** [opt-_j____-tgt-ais-cmd-__s] Error code 1 (ignored) + +opt-_j____-tgt-ais-cmd-_i_ +echo running; false +running +*** [opt-_j____-tgt-ais-cmd-_i_] Error code 1 (ignored) + +opt-_j____-tgt-ais-cmd-_is +running +*** [opt-_j____-tgt-ais-cmd-_is] Error code 1 (ignored) + +opt-_j____-tgt-ais-cmd-a__ +running +*** [opt-_j____-tgt-ais-cmd-a__] Error code 1 (ignored) + +opt-_j____-tgt-ais-cmd-a_s +running +*** [opt-_j____-tgt-ais-cmd-a_s] Error code 1 (ignored) + +opt-_j____-tgt-ais-cmd-ai_ +echo running; false +running +*** [opt-_j____-tgt-ais-cmd-ai_] Error code 1 (ignored) + +opt-_j____-tgt-ais-cmd-ais +running +*** [opt-_j____-tgt-ais-cmd-ais] Error code 1 (ignored) + +opt-_j_n__-tgt-___-cmd-___ +echo "echo running" +{ echo running +} || exit $? + +opt-_j_n__-tgt-___-cmd-__s +{ echo running +} || exit $? + +opt-_j_n__-tgt-___-cmd-_i_ +echo running; false + +opt-_j_n__-tgt-___-cmd-_is +echo running; false + +opt-_j_n__-tgt-___-cmd-a__ +echo running +running + +opt-_j_n__-tgt-___-cmd-a_s +echo running +running + +opt-_j_n__-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-__s-cmd-___ +{ echo running +} || exit $? + +opt-_j_n__-tgt-__s-cmd-__s +{ echo running +} || exit $? + +opt-_j_n__-tgt-__s-cmd-_i_ +echo running; false + +opt-_j_n__-tgt-__s-cmd-_is +echo running; false + +opt-_j_n__-tgt-__s-cmd-a__ +echo running +running + +opt-_j_n__-tgt-__s-cmd-a_s +echo running +running + +opt-_j_n__-tgt-__s-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-_i_-cmd-___ +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-_j_n__-tgt-_i_-cmd-__s +{ echo running; false +} || exit $? + +opt-_j_n__-tgt-_i_-cmd-_i_ +echo running; false + +opt-_j_n__-tgt-_i_-cmd-_is +echo running; false + +opt-_j_n__-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-_is-cmd-___ +{ echo running; false +} || exit $? + +opt-_j_n__-tgt-_is-cmd-__s +{ echo running; false +} || exit $? + +opt-_j_n__-tgt-_is-cmd-_i_ +echo running; false + +opt-_j_n__-tgt-_is-cmd-_is +echo running; false + +opt-_j_n__-tgt-_is-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-_is-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_j_n__-tgt-a__-cmd-___ +echo running +running + +opt-_j_n__-tgt-a__-cmd-__s +running + +opt-_j_n__-tgt-a__-cmd-_i_ +echo running; false +running + +opt-_j_n__-tgt-a__-cmd-_is +running + +opt-_j_n__-tgt-a__-cmd-a__ +echo running +running + +opt-_j_n__-tgt-a__-cmd-a_s +running + +opt-_j_n__-tgt-a__-cmd-ai_ +echo running; false +running + +opt-_j_n__-tgt-a__-cmd-ais +running + +opt-_j_n__-tgt-a_s-cmd-___ +running + +opt-_j_n__-tgt-a_s-cmd-__s +running + +opt-_j_n__-tgt-a_s-cmd-_i_ +echo running; false +running + +opt-_j_n__-tgt-a_s-cmd-_is +running + +opt-_j_n__-tgt-a_s-cmd-a__ +running + +opt-_j_n__-tgt-a_s-cmd-a_s +running + +opt-_j_n__-tgt-a_s-cmd-ai_ +echo running; false +running + +opt-_j_n__-tgt-a_s-cmd-ais +running + +opt-_j_n__-tgt-ai_-cmd-___ +echo running; false +running + +opt-_j_n__-tgt-ai_-cmd-__s +running + +opt-_j_n__-tgt-ai_-cmd-_i_ +echo running; false +running + +opt-_j_n__-tgt-ai_-cmd-_is +running + +opt-_j_n__-tgt-ai_-cmd-a__ +echo running; false +running + +opt-_j_n__-tgt-ai_-cmd-a_s +running + +opt-_j_n__-tgt-ai_-cmd-ai_ +echo running; false +running + +opt-_j_n__-tgt-ai_-cmd-ais +running + +opt-_j_n__-tgt-ais-cmd-___ +running + +opt-_j_n__-tgt-ais-cmd-__s +running + +opt-_j_n__-tgt-ais-cmd-_i_ +echo running; false +running + +opt-_j_n__-tgt-ais-cmd-_is +running + +opt-_j_n__-tgt-ais-cmd-a__ +running + +opt-_j_n__-tgt-ais-cmd-a_s +running + +opt-_j_n__-tgt-ais-cmd-ai_ +echo running; false +running + +opt-_j_n__-tgt-ais-cmd-ais +running + +opt-_jl___-tgt-___-cmd-___ +echo running +running + +opt-_jl___-tgt-___-cmd-__s +echo running +running + +opt-_jl___-tgt-___-cmd-_i_ +echo running; false +running +*** [opt-_jl___-tgt-___-cmd-_i_] Error code 1 (ignored) + +opt-_jl___-tgt-___-cmd-_is +echo running; false +running +*** [opt-_jl___-tgt-___-cmd-_is] Error code 1 (ignored) + +opt-_jl___-tgt-___-cmd-a__ +echo running +running + +opt-_jl___-tgt-___-cmd-a_s +echo running +running + +opt-_jl___-tgt-___-cmd-ai_ +echo running; false +running +*** [opt-_jl___-tgt-___-cmd-ai_] Error code 1 (ignored) + +opt-_jl___-tgt-___-cmd-ais +echo running; false +running +*** [opt-_jl___-tgt-___-cmd-ais] Error code 1 (ignored) + +opt-_jl___-tgt-__s-cmd-___ +running + +opt-_jl___-tgt-__s-cmd-__s +running + +opt-_jl___-tgt-__s-cmd-_i_ +echo running; false +running +*** [opt-_jl___-tgt-__s-cmd-_i_] Error code 1 (ignored) + +opt-_jl___-tgt-__s-cmd-_is +echo running; false +running +*** [opt-_jl___-tgt-__s-cmd-_is] Error code 1 (ignored) + +opt-_jl___-tgt-__s-cmd-a__ +running + +opt-_jl___-tgt-__s-cmd-a_s +running + +opt-_jl___-tgt-__s-cmd-ai_ +echo running; false +running +*** [opt-_jl___-tgt-__s-cmd-ai_] Error code 1 (ignored) + +opt-_jl___-tgt-__s-cmd-ais +echo running; false +running +*** [opt-_jl___-tgt-__s-cmd-ais] Error code 1 (ignored) + +opt-_jl___-tgt-_i_-cmd-___ +echo running; false +running +*** [opt-_jl___-tgt-_i_-cmd-___] Error code 1 (ignored) + +opt-_jl___-tgt-_i_-cmd-__s +echo running; false +running +*** [opt-_jl___-tgt-_i_-cmd-__s] Error code 1 (ignored) + +opt-_jl___-tgt-_i_-cmd-_i_ +echo running; false +running +*** [opt-_jl___-tgt-_i_-cmd-_i_] Error code 1 (ignored) + +opt-_jl___-tgt-_i_-cmd-_is +echo running; false +running +*** [opt-_jl___-tgt-_i_-cmd-_is] Error code 1 (ignored) + +opt-_jl___-tgt-_i_-cmd-a__ +echo running; false +running +*** [opt-_jl___-tgt-_i_-cmd-a__] Error code 1 (ignored) + +opt-_jl___-tgt-_i_-cmd-a_s +echo running; false +running +*** [opt-_jl___-tgt-_i_-cmd-a_s] Error code 1 (ignored) + +opt-_jl___-tgt-_i_-cmd-ai_ +echo running; false +running +*** [opt-_jl___-tgt-_i_-cmd-ai_] Error code 1 (ignored) + +opt-_jl___-tgt-_i_-cmd-ais +echo running; false +running +*** [opt-_jl___-tgt-_i_-cmd-ais] Error code 1 (ignored) + +opt-_jl___-tgt-_is-cmd-___ +running +*** [opt-_jl___-tgt-_is-cmd-___] Error code 1 (ignored) + +opt-_jl___-tgt-_is-cmd-__s +running +*** [opt-_jl___-tgt-_is-cmd-__s] Error code 1 (ignored) + +opt-_jl___-tgt-_is-cmd-_i_ +echo running; false +running +*** [opt-_jl___-tgt-_is-cmd-_i_] Error code 1 (ignored) + +opt-_jl___-tgt-_is-cmd-_is +echo running; false +running +*** [opt-_jl___-tgt-_is-cmd-_is] Error code 1 (ignored) + +opt-_jl___-tgt-_is-cmd-a__ +running +*** [opt-_jl___-tgt-_is-cmd-a__] Error code 1 (ignored) + +opt-_jl___-tgt-_is-cmd-a_s +running +*** [opt-_jl___-tgt-_is-cmd-a_s] Error code 1 (ignored) + +opt-_jl___-tgt-_is-cmd-ai_ +echo running; false +running +*** [opt-_jl___-tgt-_is-cmd-ai_] Error code 1 (ignored) + +opt-_jl___-tgt-_is-cmd-ais +echo running; false +running +*** [opt-_jl___-tgt-_is-cmd-ais] Error code 1 (ignored) + +opt-_jl___-tgt-a__-cmd-___ +echo running +running + +opt-_jl___-tgt-a__-cmd-__s +echo running +running + +opt-_jl___-tgt-a__-cmd-_i_ +echo running; false +running +*** [opt-_jl___-tgt-a__-cmd-_i_] Error code 1 (ignored) + +opt-_jl___-tgt-a__-cmd-_is +echo running; false +running +*** [opt-_jl___-tgt-a__-cmd-_is] Error code 1 (ignored) + +opt-_jl___-tgt-a__-cmd-a__ +echo running +running + +opt-_jl___-tgt-a__-cmd-a_s +echo running +running + +opt-_jl___-tgt-a__-cmd-ai_ +echo running; false +running +*** [opt-_jl___-tgt-a__-cmd-ai_] Error code 1 (ignored) + +opt-_jl___-tgt-a__-cmd-ais +echo running; false +running +*** [opt-_jl___-tgt-a__-cmd-ais] Error code 1 (ignored) + +opt-_jl___-tgt-a_s-cmd-___ +running + +opt-_jl___-tgt-a_s-cmd-__s +running + +opt-_jl___-tgt-a_s-cmd-_i_ +echo running; false +running +*** [opt-_jl___-tgt-a_s-cmd-_i_] Error code 1 (ignored) + +opt-_jl___-tgt-a_s-cmd-_is +echo running; false +running +*** [opt-_jl___-tgt-a_s-cmd-_is] Error code 1 (ignored) + +opt-_jl___-tgt-a_s-cmd-a__ +running + +opt-_jl___-tgt-a_s-cmd-a_s +running + +opt-_jl___-tgt-a_s-cmd-ai_ +echo running; false +running +*** [opt-_jl___-tgt-a_s-cmd-ai_] Error code 1 (ignored) + +opt-_jl___-tgt-a_s-cmd-ais +echo running; false +running +*** [opt-_jl___-tgt-a_s-cmd-ais] Error code 1 (ignored) + +opt-_jl___-tgt-ai_-cmd-___ +echo running; false +running +*** [opt-_jl___-tgt-ai_-cmd-___] Error code 1 (ignored) + +opt-_jl___-tgt-ai_-cmd-__s +echo running; false +running +*** [opt-_jl___-tgt-ai_-cmd-__s] Error code 1 (ignored) + +opt-_jl___-tgt-ai_-cmd-_i_ +echo running; false +running +*** [opt-_jl___-tgt-ai_-cmd-_i_] Error code 1 (ignored) + +opt-_jl___-tgt-ai_-cmd-_is +echo running; false +running +*** [opt-_jl___-tgt-ai_-cmd-_is] Error code 1 (ignored) + +opt-_jl___-tgt-ai_-cmd-a__ +echo running; false +running +*** [opt-_jl___-tgt-ai_-cmd-a__] Error code 1 (ignored) + +opt-_jl___-tgt-ai_-cmd-a_s +echo running; false +running +*** [opt-_jl___-tgt-ai_-cmd-a_s] Error code 1 (ignored) + +opt-_jl___-tgt-ai_-cmd-ai_ +echo running; false +running +*** [opt-_jl___-tgt-ai_-cmd-ai_] Error code 1 (ignored) + +opt-_jl___-tgt-ai_-cmd-ais +echo running; false +running +*** [opt-_jl___-tgt-ai_-cmd-ais] Error code 1 (ignored) + +opt-_jl___-tgt-ais-cmd-___ +running +*** [opt-_jl___-tgt-ais-cmd-___] Error code 1 (ignored) + +opt-_jl___-tgt-ais-cmd-__s +running +*** [opt-_jl___-tgt-ais-cmd-__s] Error code 1 (ignored) + +opt-_jl___-tgt-ais-cmd-_i_ +echo running; false +running +*** [opt-_jl___-tgt-ais-cmd-_i_] Error code 1 (ignored) + +opt-_jl___-tgt-ais-cmd-_is +echo running; false +running +*** [opt-_jl___-tgt-ais-cmd-_is] Error code 1 (ignored) + +opt-_jl___-tgt-ais-cmd-a__ +running +*** [opt-_jl___-tgt-ais-cmd-a__] Error code 1 (ignored) + +opt-_jl___-tgt-ais-cmd-a_s +running +*** [opt-_jl___-tgt-ais-cmd-a_s] Error code 1 (ignored) + +opt-_jl___-tgt-ais-cmd-ai_ +echo running; false +running +*** [opt-_jl___-tgt-ais-cmd-ai_] Error code 1 (ignored) + +opt-_jl___-tgt-ais-cmd-ais +echo running; false +running +*** [opt-_jl___-tgt-ais-cmd-ais] Error code 1 (ignored) + +opt-_jln__-tgt-___-cmd-___ +echo "echo running" +{ echo running +} || exit $? + +opt-_jln__-tgt-___-cmd-__s +echo "echo running" +{ echo running +} || exit $? + +opt-_jln__-tgt-___-cmd-_i_ +echo running; false + +opt-_jln__-tgt-___-cmd-_is +echo running; false + +opt-_jln__-tgt-___-cmd-a__ +echo running +running + +opt-_jln__-tgt-___-cmd-a_s +echo running +running + +opt-_jln__-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-__s-cmd-___ +{ echo running +} || exit $? + +opt-_jln__-tgt-__s-cmd-__s +{ echo running +} || exit $? + +opt-_jln__-tgt-__s-cmd-_i_ +echo running; false + +opt-_jln__-tgt-__s-cmd-_is +echo running; false + +opt-_jln__-tgt-__s-cmd-a__ +echo running +running + +opt-_jln__-tgt-__s-cmd-a_s +echo running +running + +opt-_jln__-tgt-__s-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-_i_-cmd-___ +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-_jln__-tgt-_i_-cmd-__s +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-_jln__-tgt-_i_-cmd-_i_ +echo running; false + +opt-_jln__-tgt-_i_-cmd-_is +echo running; false + +opt-_jln__-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-_is-cmd-___ +{ echo running; false +} || exit $? + +opt-_jln__-tgt-_is-cmd-__s +{ echo running; false +} || exit $? + +opt-_jln__-tgt-_is-cmd-_i_ +echo running; false + +opt-_jln__-tgt-_is-cmd-_is +echo running; false + +opt-_jln__-tgt-_is-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-_is-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-_jln__-tgt-a__-cmd-___ +echo running +running + +opt-_jln__-tgt-a__-cmd-__s +echo running +running + +opt-_jln__-tgt-a__-cmd-_i_ +echo running; false +running + +opt-_jln__-tgt-a__-cmd-_is +echo running; false +running + +opt-_jln__-tgt-a__-cmd-a__ +echo running +running + +opt-_jln__-tgt-a__-cmd-a_s +echo running +running + +opt-_jln__-tgt-a__-cmd-ai_ +echo running; false +running + +opt-_jln__-tgt-a__-cmd-ais +echo running; false +running + +opt-_jln__-tgt-a_s-cmd-___ +running + +opt-_jln__-tgt-a_s-cmd-__s +running + +opt-_jln__-tgt-a_s-cmd-_i_ +echo running; false +running + +opt-_jln__-tgt-a_s-cmd-_is +echo running; false +running + +opt-_jln__-tgt-a_s-cmd-a__ +running + +opt-_jln__-tgt-a_s-cmd-a_s +running + +opt-_jln__-tgt-a_s-cmd-ai_ +echo running; false +running + +opt-_jln__-tgt-a_s-cmd-ais +echo running; false +running + +opt-_jln__-tgt-ai_-cmd-___ +echo running; false +running + +opt-_jln__-tgt-ai_-cmd-__s +echo running; false +running + +opt-_jln__-tgt-ai_-cmd-_i_ +echo running; false +running + +opt-_jln__-tgt-ai_-cmd-_is +echo running; false +running + +opt-_jln__-tgt-ai_-cmd-a__ +echo running; false +running + +opt-_jln__-tgt-ai_-cmd-a_s +echo running; false +running + +opt-_jln__-tgt-ai_-cmd-ai_ +echo running; false +running + +opt-_jln__-tgt-ai_-cmd-ais +echo running; false +running + +opt-_jln__-tgt-ais-cmd-___ +running + +opt-_jln__-tgt-ais-cmd-__s +running + +opt-_jln__-tgt-ais-cmd-_i_ +echo running; false +running + +opt-_jln__-tgt-ais-cmd-_is +echo running; false +running + +opt-_jln__-tgt-ais-cmd-a__ +running + +opt-_jln__-tgt-ais-cmd-a_s +running + +opt-_jln__-tgt-ais-cmd-ai_ +echo running; false +running + +opt-_jln__-tgt-ais-cmd-ais +echo running; false +running + +opt-i_____-tgt-___-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-___-cmd-__s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-___-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-___-cmd-_is +running +*** Error code 1 (ignored) + +opt-i_____-tgt-___-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-___-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-___-cmd-ais +running +*** Error code 1 (ignored) + +opt-i_____-tgt-__s-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-__s-cmd-__s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-__s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-__s-cmd-_is +running +*** Error code 1 (ignored) + +opt-i_____-tgt-__s-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-__s-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-__s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-__s-cmd-ais +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_i_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_i_-cmd-__s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_i_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_i_-cmd-_is +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_i_-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_i_-cmd-ais +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_is-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_is-cmd-__s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_is-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_is-cmd-_is +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_is-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_is-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_is-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-_is-cmd-ais +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a__-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a__-cmd-__s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a__-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a__-cmd-_is +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a__-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a__-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a__-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a__-cmd-ais +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a_s-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a_s-cmd-__s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a_s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a_s-cmd-_is +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a_s-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a_s-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a_s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-a_s-cmd-ais +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ai_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ai_-cmd-__s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ai_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ai_-cmd-_is +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ai_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ai_-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ai_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ai_-cmd-ais +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ais-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ais-cmd-__s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ais-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ais-cmd-_is +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ais-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ais-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ais-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_____-tgt-ais-cmd-ais +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-___-cmd-___ +echo running; false + +opt-i__n__-tgt-___-cmd-__s +echo running; false + +opt-i__n__-tgt-___-cmd-_i_ +echo running; false + +opt-i__n__-tgt-___-cmd-_is +echo running; false + +opt-i__n__-tgt-___-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-___-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-__s-cmd-___ +echo running; false + +opt-i__n__-tgt-__s-cmd-__s +echo running; false + +opt-i__n__-tgt-__s-cmd-_i_ +echo running; false + +opt-i__n__-tgt-__s-cmd-_is +echo running; false + +opt-i__n__-tgt-__s-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-__s-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-__s-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-_i_-cmd-___ +echo running; false + +opt-i__n__-tgt-_i_-cmd-__s +echo running; false + +opt-i__n__-tgt-_i_-cmd-_i_ +echo running; false + +opt-i__n__-tgt-_i_-cmd-_is +echo running; false + +opt-i__n__-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-_is-cmd-___ +echo running; false + +opt-i__n__-tgt-_is-cmd-__s +echo running; false + +opt-i__n__-tgt-_is-cmd-_i_ +echo running; false + +opt-i__n__-tgt-_is-cmd-_is +echo running; false + +opt-i__n__-tgt-_is-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-_is-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a__-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a__-cmd-__s +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a__-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a__-cmd-_is +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a__-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a__-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a__-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a__-cmd-ais +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a_s-cmd-___ +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a_s-cmd-__s +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a_s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a_s-cmd-_is +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a_s-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a_s-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a_s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-a_s-cmd-ais +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ai_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ai_-cmd-__s +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ai_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ai_-cmd-_is +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ai_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ai_-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ai_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ai_-cmd-ais +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ais-cmd-___ +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ais-cmd-__s +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ais-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ais-cmd-_is +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ais-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ais-cmd-a_s +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ais-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i__n__-tgt-ais-cmd-ais +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-___-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-___-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-___-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-___-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-___-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-___-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-__s-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-__s-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-__s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-__s-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-__s-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-__s-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-__s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_i_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_i_-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_i_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_i_-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_is-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_is-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_is-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_is-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_is-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_is-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a__-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a__-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a__-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a__-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a__-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a__-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a__-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a__-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a_s-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a_s-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a_s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a_s-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a_s-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a_s-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a_s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-a_s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ai_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ai_-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ai_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ai_-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ai_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ai_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ai_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ai_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ais-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ais-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ais-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ais-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ais-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ais-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ais-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_l___-tgt-ais-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-___-cmd-___ +echo running; false + +opt-i_ln__-tgt-___-cmd-__s +echo running; false + +opt-i_ln__-tgt-___-cmd-_i_ +echo running; false + +opt-i_ln__-tgt-___-cmd-_is +echo running; false + +opt-i_ln__-tgt-___-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-___-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-__s-cmd-___ +echo running; false + +opt-i_ln__-tgt-__s-cmd-__s +echo running; false + +opt-i_ln__-tgt-__s-cmd-_i_ +echo running; false + +opt-i_ln__-tgt-__s-cmd-_is +echo running; false + +opt-i_ln__-tgt-__s-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-__s-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-__s-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-_i_-cmd-___ +echo running; false + +opt-i_ln__-tgt-_i_-cmd-__s +echo running; false + +opt-i_ln__-tgt-_i_-cmd-_i_ +echo running; false + +opt-i_ln__-tgt-_i_-cmd-_is +echo running; false + +opt-i_ln__-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-_is-cmd-___ +echo running; false + +opt-i_ln__-tgt-_is-cmd-__s +echo running; false + +opt-i_ln__-tgt-_is-cmd-_i_ +echo running; false + +opt-i_ln__-tgt-_is-cmd-_is +echo running; false + +opt-i_ln__-tgt-_is-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-_is-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a__-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a__-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a__-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a__-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a__-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a__-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a__-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a__-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a_s-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a_s-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a_s-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a_s-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a_s-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a_s-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a_s-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-a_s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ai_-cmd-___ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ai_-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ai_-cmd-_i_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ai_-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ai_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ai_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ai_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ai_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ais-cmd-___ +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ais-cmd-__s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ais-cmd-_i_ +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ais-cmd-_is +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ais-cmd-a__ +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ais-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ais-cmd-ai_ +running +*** Error code 1 (ignored) + +opt-i_ln__-tgt-ais-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ij____-tgt-___-cmd-___ +echo running; false +running +*** [opt-ij____-tgt-___-cmd-___] Error code 1 (ignored) + +opt-ij____-tgt-___-cmd-__s +running +*** [opt-ij____-tgt-___-cmd-__s] Error code 1 (ignored) + +opt-ij____-tgt-___-cmd-_i_ +echo running; false +running +*** [opt-ij____-tgt-___-cmd-_i_] Error code 1 (ignored) + +opt-ij____-tgt-___-cmd-_is +running +*** [opt-ij____-tgt-___-cmd-_is] Error code 1 (ignored) + +opt-ij____-tgt-___-cmd-a__ +echo running; false +running +*** [opt-ij____-tgt-___-cmd-a__] Error code 1 (ignored) + +opt-ij____-tgt-___-cmd-a_s +running +*** [opt-ij____-tgt-___-cmd-a_s] Error code 1 (ignored) + +opt-ij____-tgt-___-cmd-ai_ +echo running; false +running +*** [opt-ij____-tgt-___-cmd-ai_] Error code 1 (ignored) + +opt-ij____-tgt-___-cmd-ais +running +*** [opt-ij____-tgt-___-cmd-ais] Error code 1 (ignored) + +opt-ij____-tgt-__s-cmd-___ +running +*** [opt-ij____-tgt-__s-cmd-___] Error code 1 (ignored) + +opt-ij____-tgt-__s-cmd-__s +running +*** [opt-ij____-tgt-__s-cmd-__s] Error code 1 (ignored) + +opt-ij____-tgt-__s-cmd-_i_ +echo running; false +running +*** [opt-ij____-tgt-__s-cmd-_i_] Error code 1 (ignored) + +opt-ij____-tgt-__s-cmd-_is +running +*** [opt-ij____-tgt-__s-cmd-_is] Error code 1 (ignored) + +opt-ij____-tgt-__s-cmd-a__ +running +*** [opt-ij____-tgt-__s-cmd-a__] Error code 1 (ignored) + +opt-ij____-tgt-__s-cmd-a_s +running +*** [opt-ij____-tgt-__s-cmd-a_s] Error code 1 (ignored) + +opt-ij____-tgt-__s-cmd-ai_ +echo running; false +running +*** [opt-ij____-tgt-__s-cmd-ai_] Error code 1 (ignored) + +opt-ij____-tgt-__s-cmd-ais +running +*** [opt-ij____-tgt-__s-cmd-ais] Error code 1 (ignored) + +opt-ij____-tgt-_i_-cmd-___ +echo running; false +running +*** [opt-ij____-tgt-_i_-cmd-___] Error code 1 (ignored) + +opt-ij____-tgt-_i_-cmd-__s +running +*** [opt-ij____-tgt-_i_-cmd-__s] Error code 1 (ignored) + +opt-ij____-tgt-_i_-cmd-_i_ +echo running; false +running +*** [opt-ij____-tgt-_i_-cmd-_i_] Error code 1 (ignored) + +opt-ij____-tgt-_i_-cmd-_is +running +*** [opt-ij____-tgt-_i_-cmd-_is] Error code 1 (ignored) + +opt-ij____-tgt-_i_-cmd-a__ +echo running; false +running +*** [opt-ij____-tgt-_i_-cmd-a__] Error code 1 (ignored) + +opt-ij____-tgt-_i_-cmd-a_s +running +*** [opt-ij____-tgt-_i_-cmd-a_s] Error code 1 (ignored) + +opt-ij____-tgt-_i_-cmd-ai_ +echo running; false +running +*** [opt-ij____-tgt-_i_-cmd-ai_] Error code 1 (ignored) + +opt-ij____-tgt-_i_-cmd-ais +running +*** [opt-ij____-tgt-_i_-cmd-ais] Error code 1 (ignored) + +opt-ij____-tgt-_is-cmd-___ +running +*** [opt-ij____-tgt-_is-cmd-___] Error code 1 (ignored) + +opt-ij____-tgt-_is-cmd-__s +running +*** [opt-ij____-tgt-_is-cmd-__s] Error code 1 (ignored) + +opt-ij____-tgt-_is-cmd-_i_ +echo running; false +running +*** [opt-ij____-tgt-_is-cmd-_i_] Error code 1 (ignored) + +opt-ij____-tgt-_is-cmd-_is +running +*** [opt-ij____-tgt-_is-cmd-_is] Error code 1 (ignored) + +opt-ij____-tgt-_is-cmd-a__ +running +*** [opt-ij____-tgt-_is-cmd-a__] Error code 1 (ignored) + +opt-ij____-tgt-_is-cmd-a_s +running +*** [opt-ij____-tgt-_is-cmd-a_s] Error code 1 (ignored) + +opt-ij____-tgt-_is-cmd-ai_ +echo running; false +running +*** [opt-ij____-tgt-_is-cmd-ai_] Error code 1 (ignored) + +opt-ij____-tgt-_is-cmd-ais +running +*** [opt-ij____-tgt-_is-cmd-ais] Error code 1 (ignored) + +opt-ij____-tgt-a__-cmd-___ +echo running; false +running +*** [opt-ij____-tgt-a__-cmd-___] Error code 1 (ignored) + +opt-ij____-tgt-a__-cmd-__s +running +*** [opt-ij____-tgt-a__-cmd-__s] Error code 1 (ignored) + +opt-ij____-tgt-a__-cmd-_i_ +echo running; false +running +*** [opt-ij____-tgt-a__-cmd-_i_] Error code 1 (ignored) + +opt-ij____-tgt-a__-cmd-_is +running +*** [opt-ij____-tgt-a__-cmd-_is] Error code 1 (ignored) + +opt-ij____-tgt-a__-cmd-a__ +echo running; false +running +*** [opt-ij____-tgt-a__-cmd-a__] Error code 1 (ignored) + +opt-ij____-tgt-a__-cmd-a_s +running +*** [opt-ij____-tgt-a__-cmd-a_s] Error code 1 (ignored) + +opt-ij____-tgt-a__-cmd-ai_ +echo running; false +running +*** [opt-ij____-tgt-a__-cmd-ai_] Error code 1 (ignored) + +opt-ij____-tgt-a__-cmd-ais +running +*** [opt-ij____-tgt-a__-cmd-ais] Error code 1 (ignored) + +opt-ij____-tgt-a_s-cmd-___ +running +*** [opt-ij____-tgt-a_s-cmd-___] Error code 1 (ignored) + +opt-ij____-tgt-a_s-cmd-__s +running +*** [opt-ij____-tgt-a_s-cmd-__s] Error code 1 (ignored) + +opt-ij____-tgt-a_s-cmd-_i_ +echo running; false +running +*** [opt-ij____-tgt-a_s-cmd-_i_] Error code 1 (ignored) + +opt-ij____-tgt-a_s-cmd-_is +running +*** [opt-ij____-tgt-a_s-cmd-_is] Error code 1 (ignored) + +opt-ij____-tgt-a_s-cmd-a__ +running +*** [opt-ij____-tgt-a_s-cmd-a__] Error code 1 (ignored) + +opt-ij____-tgt-a_s-cmd-a_s +running +*** [opt-ij____-tgt-a_s-cmd-a_s] Error code 1 (ignored) + +opt-ij____-tgt-a_s-cmd-ai_ +echo running; false +running +*** [opt-ij____-tgt-a_s-cmd-ai_] Error code 1 (ignored) + +opt-ij____-tgt-a_s-cmd-ais +running +*** [opt-ij____-tgt-a_s-cmd-ais] Error code 1 (ignored) + +opt-ij____-tgt-ai_-cmd-___ +echo running; false +running +*** [opt-ij____-tgt-ai_-cmd-___] Error code 1 (ignored) + +opt-ij____-tgt-ai_-cmd-__s +running +*** [opt-ij____-tgt-ai_-cmd-__s] Error code 1 (ignored) + +opt-ij____-tgt-ai_-cmd-_i_ +echo running; false +running +*** [opt-ij____-tgt-ai_-cmd-_i_] Error code 1 (ignored) + +opt-ij____-tgt-ai_-cmd-_is +running +*** [opt-ij____-tgt-ai_-cmd-_is] Error code 1 (ignored) + +opt-ij____-tgt-ai_-cmd-a__ +echo running; false +running +*** [opt-ij____-tgt-ai_-cmd-a__] Error code 1 (ignored) + +opt-ij____-tgt-ai_-cmd-a_s +running +*** [opt-ij____-tgt-ai_-cmd-a_s] Error code 1 (ignored) + +opt-ij____-tgt-ai_-cmd-ai_ +echo running; false +running +*** [opt-ij____-tgt-ai_-cmd-ai_] Error code 1 (ignored) + +opt-ij____-tgt-ai_-cmd-ais +running +*** [opt-ij____-tgt-ai_-cmd-ais] Error code 1 (ignored) + +opt-ij____-tgt-ais-cmd-___ +running +*** [opt-ij____-tgt-ais-cmd-___] Error code 1 (ignored) + +opt-ij____-tgt-ais-cmd-__s +running +*** [opt-ij____-tgt-ais-cmd-__s] Error code 1 (ignored) + +opt-ij____-tgt-ais-cmd-_i_ +echo running; false +running +*** [opt-ij____-tgt-ais-cmd-_i_] Error code 1 (ignored) + +opt-ij____-tgt-ais-cmd-_is +running +*** [opt-ij____-tgt-ais-cmd-_is] Error code 1 (ignored) + +opt-ij____-tgt-ais-cmd-a__ +running +*** [opt-ij____-tgt-ais-cmd-a__] Error code 1 (ignored) + +opt-ij____-tgt-ais-cmd-a_s +running +*** [opt-ij____-tgt-ais-cmd-a_s] Error code 1 (ignored) + +opt-ij____-tgt-ais-cmd-ai_ +echo running; false +running +*** [opt-ij____-tgt-ais-cmd-ai_] Error code 1 (ignored) + +opt-ij____-tgt-ais-cmd-ais +running +*** [opt-ij____-tgt-ais-cmd-ais] Error code 1 (ignored) + +opt-ij_n__-tgt-___-cmd-___ +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-ij_n__-tgt-___-cmd-__s +{ echo running; false +} || exit $? + +opt-ij_n__-tgt-___-cmd-_i_ +echo running; false + +opt-ij_n__-tgt-___-cmd-_is +echo running; false + +opt-ij_n__-tgt-___-cmd-a__ +echo running; false +running +*** Error code 1 (continuing) + +opt-ij_n__-tgt-___-cmd-a_s +echo running; false +running +*** Error code 1 (continuing) + +opt-ij_n__-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-__s-cmd-___ +{ echo running; false +} || exit $? + +opt-ij_n__-tgt-__s-cmd-__s +{ echo running; false +} || exit $? + +opt-ij_n__-tgt-__s-cmd-_i_ +echo running; false + +opt-ij_n__-tgt-__s-cmd-_is +echo running; false + +opt-ij_n__-tgt-__s-cmd-a__ +echo running; false +running +*** Error code 1 (continuing) + +opt-ij_n__-tgt-__s-cmd-a_s +echo running; false +running +*** Error code 1 (continuing) + +opt-ij_n__-tgt-__s-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-_i_-cmd-___ +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-ij_n__-tgt-_i_-cmd-__s +{ echo running; false +} || exit $? + +opt-ij_n__-tgt-_i_-cmd-_i_ +echo running; false + +opt-ij_n__-tgt-_i_-cmd-_is +echo running; false + +opt-ij_n__-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-_is-cmd-___ +{ echo running; false +} || exit $? + +opt-ij_n__-tgt-_is-cmd-__s +{ echo running; false +} || exit $? + +opt-ij_n__-tgt-_is-cmd-_i_ +echo running; false + +opt-ij_n__-tgt-_is-cmd-_is +echo running; false + +opt-ij_n__-tgt-_is-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-_is-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ij_n__-tgt-a__-cmd-___ +echo running; false +running + +opt-ij_n__-tgt-a__-cmd-__s +running + +opt-ij_n__-tgt-a__-cmd-_i_ +echo running; false +running + +opt-ij_n__-tgt-a__-cmd-_is +running + +opt-ij_n__-tgt-a__-cmd-a__ +echo running; false +running + +opt-ij_n__-tgt-a__-cmd-a_s +running + +opt-ij_n__-tgt-a__-cmd-ai_ +echo running; false +running + +opt-ij_n__-tgt-a__-cmd-ais +running + +opt-ij_n__-tgt-a_s-cmd-___ +running + +opt-ij_n__-tgt-a_s-cmd-__s +running + +opt-ij_n__-tgt-a_s-cmd-_i_ +echo running; false +running + +opt-ij_n__-tgt-a_s-cmd-_is +running + +opt-ij_n__-tgt-a_s-cmd-a__ +running + +opt-ij_n__-tgt-a_s-cmd-a_s +running + +opt-ij_n__-tgt-a_s-cmd-ai_ +echo running; false +running + +opt-ij_n__-tgt-a_s-cmd-ais +running + +opt-ij_n__-tgt-ai_-cmd-___ +echo running; false +running + +opt-ij_n__-tgt-ai_-cmd-__s +running + +opt-ij_n__-tgt-ai_-cmd-_i_ +echo running; false +running + +opt-ij_n__-tgt-ai_-cmd-_is +running + +opt-ij_n__-tgt-ai_-cmd-a__ +echo running; false +running + +opt-ij_n__-tgt-ai_-cmd-a_s +running + +opt-ij_n__-tgt-ai_-cmd-ai_ +echo running; false +running + +opt-ij_n__-tgt-ai_-cmd-ais +running + +opt-ij_n__-tgt-ais-cmd-___ +running + +opt-ij_n__-tgt-ais-cmd-__s +running + +opt-ij_n__-tgt-ais-cmd-_i_ +echo running; false +running + +opt-ij_n__-tgt-ais-cmd-_is +running + +opt-ij_n__-tgt-ais-cmd-a__ +running + +opt-ij_n__-tgt-ais-cmd-a_s +running + +opt-ij_n__-tgt-ais-cmd-ai_ +echo running; false +running + +opt-ij_n__-tgt-ais-cmd-ais +running + +opt-ijl___-tgt-___-cmd-___ +echo running; false +running +*** [opt-ijl___-tgt-___-cmd-___] Error code 1 (ignored) + +opt-ijl___-tgt-___-cmd-__s +echo running; false +running +*** [opt-ijl___-tgt-___-cmd-__s] Error code 1 (ignored) + +opt-ijl___-tgt-___-cmd-_i_ +echo running; false +running +*** [opt-ijl___-tgt-___-cmd-_i_] Error code 1 (ignored) + +opt-ijl___-tgt-___-cmd-_is +echo running; false +running +*** [opt-ijl___-tgt-___-cmd-_is] Error code 1 (ignored) + +opt-ijl___-tgt-___-cmd-a__ +echo running; false +running +*** [opt-ijl___-tgt-___-cmd-a__] Error code 1 (ignored) + +opt-ijl___-tgt-___-cmd-a_s +echo running; false +running +*** [opt-ijl___-tgt-___-cmd-a_s] Error code 1 (ignored) + +opt-ijl___-tgt-___-cmd-ai_ +echo running; false +running +*** [opt-ijl___-tgt-___-cmd-ai_] Error code 1 (ignored) + +opt-ijl___-tgt-___-cmd-ais +echo running; false +running +*** [opt-ijl___-tgt-___-cmd-ais] Error code 1 (ignored) + +opt-ijl___-tgt-__s-cmd-___ +running +*** [opt-ijl___-tgt-__s-cmd-___] Error code 1 (ignored) + +opt-ijl___-tgt-__s-cmd-__s +running +*** [opt-ijl___-tgt-__s-cmd-__s] Error code 1 (ignored) + +opt-ijl___-tgt-__s-cmd-_i_ +echo running; false +running +*** [opt-ijl___-tgt-__s-cmd-_i_] Error code 1 (ignored) + +opt-ijl___-tgt-__s-cmd-_is +echo running; false +running +*** [opt-ijl___-tgt-__s-cmd-_is] Error code 1 (ignored) + +opt-ijl___-tgt-__s-cmd-a__ +running +*** [opt-ijl___-tgt-__s-cmd-a__] Error code 1 (ignored) + +opt-ijl___-tgt-__s-cmd-a_s +running +*** [opt-ijl___-tgt-__s-cmd-a_s] Error code 1 (ignored) + +opt-ijl___-tgt-__s-cmd-ai_ +echo running; false +running +*** [opt-ijl___-tgt-__s-cmd-ai_] Error code 1 (ignored) + +opt-ijl___-tgt-__s-cmd-ais +echo running; false +running +*** [opt-ijl___-tgt-__s-cmd-ais] Error code 1 (ignored) + +opt-ijl___-tgt-_i_-cmd-___ +echo running; false +running +*** [opt-ijl___-tgt-_i_-cmd-___] Error code 1 (ignored) + +opt-ijl___-tgt-_i_-cmd-__s +echo running; false +running +*** [opt-ijl___-tgt-_i_-cmd-__s] Error code 1 (ignored) + +opt-ijl___-tgt-_i_-cmd-_i_ +echo running; false +running +*** [opt-ijl___-tgt-_i_-cmd-_i_] Error code 1 (ignored) + +opt-ijl___-tgt-_i_-cmd-_is +echo running; false +running +*** [opt-ijl___-tgt-_i_-cmd-_is] Error code 1 (ignored) + +opt-ijl___-tgt-_i_-cmd-a__ +echo running; false +running +*** [opt-ijl___-tgt-_i_-cmd-a__] Error code 1 (ignored) + +opt-ijl___-tgt-_i_-cmd-a_s +echo running; false +running +*** [opt-ijl___-tgt-_i_-cmd-a_s] Error code 1 (ignored) + +opt-ijl___-tgt-_i_-cmd-ai_ +echo running; false +running +*** [opt-ijl___-tgt-_i_-cmd-ai_] Error code 1 (ignored) + +opt-ijl___-tgt-_i_-cmd-ais +echo running; false +running +*** [opt-ijl___-tgt-_i_-cmd-ais] Error code 1 (ignored) + +opt-ijl___-tgt-_is-cmd-___ +running +*** [opt-ijl___-tgt-_is-cmd-___] Error code 1 (ignored) + +opt-ijl___-tgt-_is-cmd-__s +running +*** [opt-ijl___-tgt-_is-cmd-__s] Error code 1 (ignored) + +opt-ijl___-tgt-_is-cmd-_i_ +echo running; false +running +*** [opt-ijl___-tgt-_is-cmd-_i_] Error code 1 (ignored) + +opt-ijl___-tgt-_is-cmd-_is +echo running; false +running +*** [opt-ijl___-tgt-_is-cmd-_is] Error code 1 (ignored) + +opt-ijl___-tgt-_is-cmd-a__ +running +*** [opt-ijl___-tgt-_is-cmd-a__] Error code 1 (ignored) + +opt-ijl___-tgt-_is-cmd-a_s +running +*** [opt-ijl___-tgt-_is-cmd-a_s] Error code 1 (ignored) + +opt-ijl___-tgt-_is-cmd-ai_ +echo running; false +running +*** [opt-ijl___-tgt-_is-cmd-ai_] Error code 1 (ignored) + +opt-ijl___-tgt-_is-cmd-ais +echo running; false +running +*** [opt-ijl___-tgt-_is-cmd-ais] Error code 1 (ignored) + +opt-ijl___-tgt-a__-cmd-___ +echo running; false +running +*** [opt-ijl___-tgt-a__-cmd-___] Error code 1 (ignored) + +opt-ijl___-tgt-a__-cmd-__s +echo running; false +running +*** [opt-ijl___-tgt-a__-cmd-__s] Error code 1 (ignored) + +opt-ijl___-tgt-a__-cmd-_i_ +echo running; false +running +*** [opt-ijl___-tgt-a__-cmd-_i_] Error code 1 (ignored) + +opt-ijl___-tgt-a__-cmd-_is +echo running; false +running +*** [opt-ijl___-tgt-a__-cmd-_is] Error code 1 (ignored) + +opt-ijl___-tgt-a__-cmd-a__ +echo running; false +running +*** [opt-ijl___-tgt-a__-cmd-a__] Error code 1 (ignored) + +opt-ijl___-tgt-a__-cmd-a_s +echo running; false +running +*** [opt-ijl___-tgt-a__-cmd-a_s] Error code 1 (ignored) + +opt-ijl___-tgt-a__-cmd-ai_ +echo running; false +running +*** [opt-ijl___-tgt-a__-cmd-ai_] Error code 1 (ignored) + +opt-ijl___-tgt-a__-cmd-ais +echo running; false +running +*** [opt-ijl___-tgt-a__-cmd-ais] Error code 1 (ignored) + +opt-ijl___-tgt-a_s-cmd-___ +running +*** [opt-ijl___-tgt-a_s-cmd-___] Error code 1 (ignored) + +opt-ijl___-tgt-a_s-cmd-__s +running +*** [opt-ijl___-tgt-a_s-cmd-__s] Error code 1 (ignored) + +opt-ijl___-tgt-a_s-cmd-_i_ +echo running; false +running +*** [opt-ijl___-tgt-a_s-cmd-_i_] Error code 1 (ignored) + +opt-ijl___-tgt-a_s-cmd-_is +echo running; false +running +*** [opt-ijl___-tgt-a_s-cmd-_is] Error code 1 (ignored) + +opt-ijl___-tgt-a_s-cmd-a__ +running +*** [opt-ijl___-tgt-a_s-cmd-a__] Error code 1 (ignored) + +opt-ijl___-tgt-a_s-cmd-a_s +running +*** [opt-ijl___-tgt-a_s-cmd-a_s] Error code 1 (ignored) + +opt-ijl___-tgt-a_s-cmd-ai_ +echo running; false +running +*** [opt-ijl___-tgt-a_s-cmd-ai_] Error code 1 (ignored) + +opt-ijl___-tgt-a_s-cmd-ais +echo running; false +running +*** [opt-ijl___-tgt-a_s-cmd-ais] Error code 1 (ignored) + +opt-ijl___-tgt-ai_-cmd-___ +echo running; false +running +*** [opt-ijl___-tgt-ai_-cmd-___] Error code 1 (ignored) + +opt-ijl___-tgt-ai_-cmd-__s +echo running; false +running +*** [opt-ijl___-tgt-ai_-cmd-__s] Error code 1 (ignored) + +opt-ijl___-tgt-ai_-cmd-_i_ +echo running; false +running +*** [opt-ijl___-tgt-ai_-cmd-_i_] Error code 1 (ignored) + +opt-ijl___-tgt-ai_-cmd-_is +echo running; false +running +*** [opt-ijl___-tgt-ai_-cmd-_is] Error code 1 (ignored) + +opt-ijl___-tgt-ai_-cmd-a__ +echo running; false +running +*** [opt-ijl___-tgt-ai_-cmd-a__] Error code 1 (ignored) + +opt-ijl___-tgt-ai_-cmd-a_s +echo running; false +running +*** [opt-ijl___-tgt-ai_-cmd-a_s] Error code 1 (ignored) + +opt-ijl___-tgt-ai_-cmd-ai_ +echo running; false +running +*** [opt-ijl___-tgt-ai_-cmd-ai_] Error code 1 (ignored) + +opt-ijl___-tgt-ai_-cmd-ais +echo running; false +running +*** [opt-ijl___-tgt-ai_-cmd-ais] Error code 1 (ignored) + +opt-ijl___-tgt-ais-cmd-___ +running +*** [opt-ijl___-tgt-ais-cmd-___] Error code 1 (ignored) + +opt-ijl___-tgt-ais-cmd-__s +running +*** [opt-ijl___-tgt-ais-cmd-__s] Error code 1 (ignored) + +opt-ijl___-tgt-ais-cmd-_i_ +echo running; false +running +*** [opt-ijl___-tgt-ais-cmd-_i_] Error code 1 (ignored) + +opt-ijl___-tgt-ais-cmd-_is +echo running; false +running +*** [opt-ijl___-tgt-ais-cmd-_is] Error code 1 (ignored) + +opt-ijl___-tgt-ais-cmd-a__ +running +*** [opt-ijl___-tgt-ais-cmd-a__] Error code 1 (ignored) + +opt-ijl___-tgt-ais-cmd-a_s +running +*** [opt-ijl___-tgt-ais-cmd-a_s] Error code 1 (ignored) + +opt-ijl___-tgt-ais-cmd-ai_ +echo running; false +running +*** [opt-ijl___-tgt-ais-cmd-ai_] Error code 1 (ignored) + +opt-ijl___-tgt-ais-cmd-ais +echo running; false +running +*** [opt-ijl___-tgt-ais-cmd-ais] Error code 1 (ignored) + +opt-ijln__-tgt-___-cmd-___ +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-ijln__-tgt-___-cmd-__s +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-ijln__-tgt-___-cmd-_i_ +echo running; false + +opt-ijln__-tgt-___-cmd-_is +echo running; false + +opt-ijln__-tgt-___-cmd-a__ +echo running; false +running +*** Error code 1 (continuing) + +opt-ijln__-tgt-___-cmd-a_s +echo running; false +running +*** Error code 1 (continuing) + +opt-ijln__-tgt-___-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-___-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-__s-cmd-___ +{ echo running; false +} || exit $? + +opt-ijln__-tgt-__s-cmd-__s +{ echo running; false +} || exit $? + +opt-ijln__-tgt-__s-cmd-_i_ +echo running; false + +opt-ijln__-tgt-__s-cmd-_is +echo running; false + +opt-ijln__-tgt-__s-cmd-a__ +echo running; false +running +*** Error code 1 (continuing) + +opt-ijln__-tgt-__s-cmd-a_s +echo running; false +running +*** Error code 1 (continuing) + +opt-ijln__-tgt-__s-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-__s-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-_i_-cmd-___ +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-ijln__-tgt-_i_-cmd-__s +echo "echo running; false" +{ echo running; false +} || exit $? + +opt-ijln__-tgt-_i_-cmd-_i_ +echo running; false + +opt-ijln__-tgt-_i_-cmd-_is +echo running; false + +opt-ijln__-tgt-_i_-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-_i_-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-_i_-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-_i_-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-_is-cmd-___ +{ echo running; false +} || exit $? + +opt-ijln__-tgt-_is-cmd-__s +{ echo running; false +} || exit $? + +opt-ijln__-tgt-_is-cmd-_i_ +echo running; false + +opt-ijln__-tgt-_is-cmd-_is +echo running; false + +opt-ijln__-tgt-_is-cmd-a__ +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-_is-cmd-a_s +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-_is-cmd-ai_ +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-_is-cmd-ais +echo running; false +running +*** Error code 1 (ignored) + +opt-ijln__-tgt-a__-cmd-___ +echo running; false +running + +opt-ijln__-tgt-a__-cmd-__s +echo running; false +running + +opt-ijln__-tgt-a__-cmd-_i_ +echo running; false +running + +opt-ijln__-tgt-a__-cmd-_is +echo running; false +running + +opt-ijln__-tgt-a__-cmd-a__ +echo running; false +running + +opt-ijln__-tgt-a__-cmd-a_s +echo running; false +running + +opt-ijln__-tgt-a__-cmd-ai_ +echo running; false +running + +opt-ijln__-tgt-a__-cmd-ais +echo running; false +running + +opt-ijln__-tgt-a_s-cmd-___ +running + +opt-ijln__-tgt-a_s-cmd-__s +running + +opt-ijln__-tgt-a_s-cmd-_i_ +echo running; false +running + +opt-ijln__-tgt-a_s-cmd-_is +echo running; false +running + +opt-ijln__-tgt-a_s-cmd-a__ +running + +opt-ijln__-tgt-a_s-cmd-a_s +running + +opt-ijln__-tgt-a_s-cmd-ai_ +echo running; false +running + +opt-ijln__-tgt-a_s-cmd-ais +echo running; false +running + +opt-ijln__-tgt-ai_-cmd-___ +echo running; false +running + +opt-ijln__-tgt-ai_-cmd-__s +echo running; false +running + +opt-ijln__-tgt-ai_-cmd-_i_ +echo running; false +running + +opt-ijln__-tgt-ai_-cmd-_is +echo running; false +running + +opt-ijln__-tgt-ai_-cmd-a__ +echo running; false +running + +opt-ijln__-tgt-ai_-cmd-a_s +echo running; false +running + +opt-ijln__-tgt-ai_-cmd-ai_ +echo running; false +running + +opt-ijln__-tgt-ai_-cmd-ais +echo running; false +running + +opt-ijln__-tgt-ais-cmd-___ +running + +opt-ijln__-tgt-ais-cmd-__s +running + +opt-ijln__-tgt-ais-cmd-_i_ +echo running; false +running + +opt-ijln__-tgt-ais-cmd-_is +echo running; false +running + +opt-ijln__-tgt-ais-cmd-a__ +running + +opt-ijln__-tgt-ais-cmd-a_s +running + +opt-ijln__-tgt-ais-cmd-ai_ +echo running; false +running + +opt-ijln__-tgt-ais-cmd-ais +echo running; false +running +exit status 0 diff --git a/unit-tests/sh-flags.mk b/unit-tests/sh-flags.mk new file mode 100644 index 000000000000..a4e17ca88384 --- /dev/null +++ b/unit-tests/sh-flags.mk @@ -0,0 +1,138 @@ +# $NetBSD: sh-flags.mk,v 1.4 2020/12/12 12:19:18 rillig Exp $ +# +# Tests for the effective RunFlags of a shell command (run/skip, echo/silent, +# error check, trace), which are controlled by 12 different switches. These +# switches interact in various non-obvious ways. To analyze the interactions, +# this test runs each possible combination of these switches, for now. +# +# As soon as an interaction of switches is identified as obvious and expected, +# this particular interaction may be removed from the test, to focus on the +# remaining ones. +# +# See also: +# Compat_RunCommand +# JobPrintSpecials + +all: .PHONY + +opt-ignerr.yes= -i +opt-jobs.yes= -j1 +opt-loud.no= -d0 # side effect: make stdout unbuffered +opt-loud.yes= -dl # side effect: make stdout unbuffered +opt-no-action.yes= -n +opt-silent.yes= -s +opt-xtrace.yes= -dx +tgt-always.yes= .MAKE +tgt-ignerr.yes= .IGNORE +tgt-silent.yes= .SILENT +cmd-always.yes= + +cmd-ignerr.yes= - +cmd-silent.yes= @ + +letter.always.yes= a +letter.ignerr.yes= i +letter.jobs.yes= j +letter.loud.yes= l +letter.no-action.yes= n +letter.silent.yes= s +letter.xtrace.yes= x + +.if !defined(OPT_TARGET) +.for opt-ignerr in no yes +.for opt-jobs in no yes +.for opt-loud in no yes +.for opt-no-action in no yes +# Only 'no', not 'yes', since job->echo is based trivially on opts.silent. +.for opt-silent in no +# Only 'no', not 'yes', since that would add uncontrollable output from +# reading /etc/profile or similar files. +.for opt-xtrace in no + +target= opt- +target+= ${letter.ignerr.${opt-ignerr}:U_} +target+= ${letter.jobs.${opt-jobs}:U_} +target+= ${letter.loud.${opt-loud}:U_} +target+= ${letter.no-action.${opt-no-action}:U_} +target+= ${letter.silent.${opt-silent}:U_} +target+= ${letter.xtrace.${opt-xtrace}:U_} + +.for target in ${target:ts} + +MAKE_CMD.${target}= ${MAKE} +MAKE_CMD.${target}+= ${opt-ignerr.${opt-ignerr}} +MAKE_CMD.${target}+= ${opt-jobs.${opt-jobs}} +MAKE_CMD.${target}+= ${opt-loud.${opt-loud}} +MAKE_CMD.${target}+= ${opt-no-action.${opt-no-action}} +MAKE_CMD.${target}+= ${opt-silent.${opt-silent}} +MAKE_CMD.${target}+= ${opt-xtrace.${opt-xtrace}} +MAKE_CMD.${target}+= -f ${MAKEFILE} +MAKE_CMD.${target}+= OPT_TARGET=${target} +MAKE_CMD.${target}+= ${target} + +all: ${target} +${target}: .PHONY + @${MAKE_CMD.${target}:M*} + +.endfor +.endfor +.endfor +.endfor +.endfor +.endfor +.endfor +.endif + +SILENT.yes= @ +ALWAYS.yes= + +IGNERR.yes= - + +.if defined(OPT_TARGET) +.for tgt-always in no yes +.for tgt-ignerr in no yes +.for tgt-silent in no yes +.for cmd-always in no yes +.for cmd-ignerr in no yes +.for cmd-silent in no yes + +target= ${OPT_TARGET}-tgt- +target+= ${letter.always.${tgt-always}:U_} +target+= ${letter.ignerr.${tgt-ignerr}:U_} +target+= ${letter.silent.${tgt-silent}:U_} +target+= -cmd- +target+= ${letter.always.${cmd-always}:U_} +target+= ${letter.ignerr.${cmd-ignerr}:U_} +target+= ${letter.silent.${cmd-silent}:U_} + +.for target in ${target:ts} + +${OPT_TARGET}: .WAIT ${target} .WAIT +.if ${tgt-always} == yes +${target}: .MAKE +.endif +.if ${tgt-ignerr} == yes +${target}: .IGNORE +.endif +.if ${tgt-silent} == yes +${target}: .SILENT +.endif + +RUNFLAGS.${target}= ${SILENT.${cmd-silent}}${ALWAYS.${cmd-always}}${IGNERR.${cmd-ignerr}} +.if ${OPT_TARGET:M*i*} || ${tgt-ignerr} == yes || ${cmd-ignerr} == yes +CMD.${target}= echo running; false +.else +CMD.${target}= echo running +.endif + +${target}: .PHONY + @+echo hide-from-output + @+echo hide-from-output ${target} + ${RUNFLAGS.${target}} ${CMD.${target}} +.endfor + +.endfor +.endfor +.endfor +.endfor +.endfor +.endfor +.endif diff --git a/unit-tests/sh-jobs.exp b/unit-tests/sh-jobs.exp index 39a9383953dd..ef0c574fceed 100644 --- a/unit-tests/sh-jobs.exp +++ b/unit-tests/sh-jobs.exp @@ -1 +1,6 @@ -exit status 0 +comment-with-followup-line: This is printed. +no-comment: This is printed. +*** [no-comment] Error code 1 + +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/sh-jobs.mk b/unit-tests/sh-jobs.mk index 62172c2a0c86..e8d4f976109a 100644 --- a/unit-tests/sh-jobs.mk +++ b/unit-tests/sh-jobs.mk @@ -1,9 +1,35 @@ -# $NetBSD: sh-jobs.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: sh-jobs.mk,v 1.3 2020/12/11 01:06:10 rillig Exp $ # # Tests for the "run in jobs mode" part of the "Shell Commands" section # from the manual page. -# TODO: Implementation +# TODO: Tutorial -all: - @:; +.MAKEFLAGS: -j1 + +all: .PHONY comment .WAIT comment-with-followup-line .WAIT no-comment + +# If a shell command starts with a comment character after stripping the +# leading '@', it is run in ignore-errors mode since the default runChkTmpl +# would lead to a syntax error in the generated shell file, at least for +# bash and dash, but not for NetBSD sh and ksh. +# +# See JobPrintCommand, cmdTemplate, runIgnTmpl +comment: .PHONY + @# comment + +# If a shell command starts with a comment character after stripping the +# leading '@', it is run in ignore-errors mode. +# +# See JobPrintCommand, cmdTemplate, runIgnTmpl +comment-with-followup-line: .PHONY + @# comment${.newline}echo '$@: This is printed.'; false + @true + +# Without the comment, the commands are run in the default mode, which checks +# the exit status of every makefile line. +# +# See JobPrintCommand, cmdTemplate, runChkTmpl +no-comment: .PHONY + @echo '$@: This is printed.'; false + @true diff --git a/unit-tests/sh-meta-chars.mk b/unit-tests/sh-meta-chars.mk index a029c73a855c..10e29b4b117b 100644 --- a/unit-tests/sh-meta-chars.mk +++ b/unit-tests/sh-meta-chars.mk @@ -1,15 +1,24 @@ -# $NetBSD: sh-meta-chars.mk,v 1.3 2020/11/15 20:20:58 rillig Exp $ +# $NetBSD: sh-meta-chars.mk,v 1.4 2020/12/07 22:27:56 rillig Exp $ # # Tests for running shell commands that contain meta-characters. # # These meta-characters decide whether the command is run by the shell # or executed directly via execv, but only in compatibility mode, not # in jobs mode, and only if MAKE_NATIVE is defined during compilation. # # See also: # Compat_RunCommand, useShell -# TODO: Implementation - all: - @:; + +# The command "exit 0" contains no special characters, therefore it is +# run directly via execv, but only if MAKE_NATIVE is defined. +USING_EXEC!= { echo 'all:; exit 0' | ${MAKE} -r -f - 1>/dev/null 2>&1; } \ + && echo yes || echo no + +# It's hard to do any useful tests that result in the same output. +# See SED_CMDS.sh-dots, which normalizes the test output for the specific +# case of the special command '...'. +.if ${USING_EXEC} != "yes" && ${USING_EXEC} != "no" +. error +.endif diff --git a/unit-tests/shell-csh.mk b/unit-tests/shell-csh.mk index 590775dbcb5a..99852e33ce16 100644 --- a/unit-tests/shell-csh.mk +++ b/unit-tests/shell-csh.mk @@ -1,40 +1,40 @@ -# $NetBSD: shell-csh.mk,v 1.5 2020/10/19 19:14:11 rillig Exp $ +# $NetBSD: shell-csh.mk,v 1.7 2020/12/13 02:09:55 sjg Exp $ # # Tests for using a C shell for running the commands. -CSH!= which csh || true +CSH!= which csh 2> /dev/null || true # The shell path must be an absolute path. # This is only obvious in parallel mode since in compat mode, # simple commands are executed via execve directly. .if ${CSH} != "" .SHELL: name="csh" path="${CSH}" .endif -# In parallel mode, the commandShell->noPrint command is filtered from +# In parallel mode, the shell->noPrint command is filtered from # the output, rather naively (in JobOutput). # # Until 2020-10-03, the output in parallel mode was garbled because # the definition of the csh had been wrong since 1993 at least. .MAKEFLAGS: -j1 all: .if ${CSH} != "" # This command is both printed and executed. echo normal # This command is only executed. @echo hidden # This command is both printed and executed. +echo always # This command is both printed and executed. -echo ignore errors # In the C shell, "unset verbose" is set as the noPrint command. # Therefore it is filtered from the output, rather naively. @echo 'They chatted in the sunset verbosely.' .else @sed '$$d' ${MAKEFILE:.mk=.exp} # This is cheated. .endif diff --git a/unit-tests/suff-add-later.exp b/unit-tests/suff-add-later.exp index 0556529457f7..663016a672c1 100644 --- a/unit-tests/suff-add-later.exp +++ b/unit-tests/suff-add-later.exp @@ -1,15 +1,21 @@ +Adding suffix ".c" +Adding suffix ".d" defining transformation from `.c' to `.d' inserting ".c" (1) at end of list inserting ".d" (2) at end of list +Adding suffix ".e" defining transformation from `.d' to `.e' inserting ".d" (2) at end of list inserting ".e" (3) at end of list : 'Making issue5a.c out of nothing.' make: don't know how to make issue5a.d (continuing) make: don't know how to make issue5b.c (continuing) make: don't know how to make issue5c (continuing) : 'Making issue5d.d out of nothing.' make: don't know how to make issue5d.e (continuing) make: don't know how to make issue5e.d (continuing) `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/suff-clear-regular.exp b/unit-tests/suff-clear-regular.exp index f3d73f6e4a2f..75db9b47a55b 100644 --- a/unit-tests/suff-clear-regular.exp +++ b/unit-tests/suff-clear-regular.exp @@ -1,5 +1,8 @@ make: don't know how to make .a (continuing) make: don't know how to make .a.b (continuing) make: don't know how to make .b.a (continuing) `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/suff-clear-regular.mk b/unit-tests/suff-clear-regular.mk index 4f98aa374818..227492bae082 100644 --- a/unit-tests/suff-clear-regular.mk +++ b/unit-tests/suff-clear-regular.mk @@ -1,31 +1,30 @@ -# $NetBSD: suff-clear-regular.mk,v 1.1 2020/10/20 20:36:53 rillig Exp $ +# $NetBSD: suff-clear-regular.mk,v 1.2 2020/12/07 00:53:30 rillig Exp $ # # https://gnats.netbsd.org/49086, issue 4: # Suffix rules do not become regular rules when .SUFFIXES is cleared. all: .a .a.b .b.a .SUFFIXES: .a .b .c # At this point, .a and .b are known suffixes, therefore the following # targets are interpreted as transformation rules. .a .a.b .b.a: : 'Making ${.TARGET} from ${.IMPSRC}.' # The empty .SUFFIXES discards all previous suffixes. # This means the above rules should be turned into regular targets. .SUFFIXES: # XXX: As of 2020-10-20, the result is unexpected. # XXX: .a.b is still a transformation rule. # XXX: .a belongs to "Files that are only sources". # XXX: .a.b belongs to "Files that are only sources". # XXX: .b.a belongs to "Files that are only sources". # XXX: .a is listed in "Transformations". # XXX: .a.b is listed in "Transformations". # XXX: .b.a is listed in "Transformations". # XXX: don't know how to make .a # XXX: don't know how to make .a.b # XXX: don't know how to make .b.a -# XXX: exit status 0 #.MAKEFLAGS: -dg1 diff --git a/unit-tests/suff-clear-single.exp b/unit-tests/suff-clear-single.exp index f8abe6348b34..aa46ac75f6da 100644 --- a/unit-tests/suff-clear-single.exp +++ b/unit-tests/suff-clear-single.exp @@ -1,3 +1,6 @@ make: don't know how to make issue3 (continuing) `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/suff-incomplete.exp b/unit-tests/suff-incomplete.exp new file mode 100644 index 000000000000..721f20eb33db --- /dev/null +++ b/unit-tests/suff-incomplete.exp @@ -0,0 +1,42 @@ +ParseReadLine (9): '.SUFFIXES:' +ParseDoDependency(.SUFFIXES:) +Clearing all suffixes +ParseReadLine (11): '.SUFFIXES: .a .b .c' +ParseDoDependency(.SUFFIXES: .a .b .c) +Adding suffix ".a" +Adding suffix ".b" +Adding suffix ".c" +ParseReadLine (17): '.a.b:' +ParseDoDependency(.a.b:) +defining transformation from `.a' to `.b' +inserting ".a" (1) at end of list +inserting ".b" (2) at end of list +ParseReadLine (21): '.a.c: ${.PREFIX}.dependency' +deleting incomplete transformation from `.a' to `.b' +ParseDoDependency(.a.c: ${.PREFIX}.dependency) +defining transformation from `.a' to `.c' +inserting ".a" (1) at end of list +inserting ".c" (3) at end of list +# LinkSource: added child .a.c - ${.PREFIX}.dependency +# .a.c, made UNMADE, type OP_DEPENDS|OP_TRANSFORM, flags none +# ${.PREFIX}.dependency, made UNMADE, type none, flags none +ParseReadLine (23): '.DEFAULT:' +transformation .a.c complete +ParseDoDependency(.DEFAULT:) +ParseReadLine (24): ' : Making ${.TARGET} from ${.IMPSRC} all ${.ALLSRC} by default.' +transformation .DEFAULT complete +Wildcard expanding "all"... +SuffFindDeps "all" + No known suffix on all. Using .NULL suffix +adding suffix rules +Wildcard expanding "suff-incomplete.c"...suffix is ".c"... +SuffFindDeps "suff-incomplete.c" + trying suff-incomplete.a...not there +Wildcard expanding "suff-incomplete.c"...suffix is ".c"... +: Making suff-incomplete.c from suff-incomplete.c all by default. +Wildcard expanding "all"... +SuffFindDeps ".END" + No known suffix on .END. Using .NULL suffix +adding suffix rules +Wildcard expanding ".END"... +exit status 0 diff --git a/unit-tests/suff-incomplete.mk b/unit-tests/suff-incomplete.mk new file mode 100644 index 000000000000..474c7aaab664 --- /dev/null +++ b/unit-tests/suff-incomplete.mk @@ -0,0 +1,31 @@ +# $NetBSD: suff-incomplete.mk,v 1.2 2020/11/22 11:05:49 rillig Exp $ +# +# Tests incomplete transformation rules, which are ignored. + +all: suff-incomplete.c + +.MAKEFLAGS: -dps + +.SUFFIXES: + +.SUFFIXES: .a .b .c + +# This rule has no commands and no dependencies, therefore it is incomplete +# and not added to the transformation rules. +# +# See Suff_EndTransform. +.a.b: + +# This rule has a dependency, therefore it is a complete transformation. +# Its commands are taken from a .DEFAULT target, if there is any. +.a.c: ${.PREFIX}.dependency + +.DEFAULT: + : Making ${.TARGET} from ${.IMPSRC} all ${.ALLSRC} by default. + +# The debug log says "transformation .DEFAULT complete", which seems wrong +# on the first sight. It is intentionally done though, in the call to +# GNode_New(".DEFAULT"). + +# XXX: The output of this test says "Making suff-incomplete.c from +# suff-incomplete.c". It doesn't make sense to make something out of itself. diff --git a/unit-tests/suff-lookup.exp b/unit-tests/suff-lookup.exp index 6714e7975e18..a8f893fa9492 100644 --- a/unit-tests/suff-lookup.exp +++ b/unit-tests/suff-lookup.exp @@ -1,58 +1,71 @@ +Adding suffix ".c" +Adding suffix ".cc" +Adding suffix ".ccc" +Adding suffix ".short" +Adding suffix ".sho" +Adding suffix ".dead-end" defining transformation from `.ccc' to `.cc' inserting ".ccc" (3) at end of list inserting ".cc" (2) at end of list transformation .ccc.cc complete defining transformation from `.c' to `.ccc' inserting ".c" (1) at end of list inserting ".ccc" (3) at end of list transformation .c.ccc complete defining transformation from `.short' to `.c' inserting ".short" (4) at end of list inserting ".c" (1) at end of list transformation .short.c complete defining transformation from `.sho' to `.c' inserting ".sho" (5) at end of list inserting ".c" (1) at end of list transformation .sho.c complete defining transformation from `.dead-end' to `.short' inserting ".dead-end" (6) at end of list inserting ".short" (4) at end of list transformation .dead-end.short complete +Clearing all suffixes +Adding suffix ".c" +Adding suffix ".cc" +Adding suffix ".ccc" inserting ".ccc" (3) at end of list inserting ".cc" (2) at end of list inserting ".c" (1) at end of list inserting ".ccc" (3) at end of list +Adding suffix ".short" inserting ".short" (4) at end of list inserting ".c" (1) at end of list +Adding suffix ".sho" inserting ".sho" (5) at end of list inserting ".c" (1) at end of list +Adding suffix ".dead-end" inserting ".dead-end" (6) at end of list inserting ".short" (4) at end of list Wildcard expanding "all"... -SuffFindDeps (all) +SuffFindDeps "all" No known suffix on all. Using .NULL suffix adding suffix rules Wildcard expanding "suff-lookup.cc"...suffix is ".cc"... -SuffFindDeps (suff-lookup.cc) +SuffFindDeps "suff-lookup.cc" trying suff-lookup.ccc...not there trying suff-lookup.c...not there trying suff-lookup.short...not there trying suff-lookup.sho...got it applying .sho -> .c to "suff-lookup.c" applying .c -> .ccc to "suff-lookup.ccc" applying .ccc -> .cc to "suff-lookup.cc" suffix is ".ccc"... suffix is ".c"... suffix is ".sho"... -SuffFindDeps (suff-lookup.sho) +SuffFindDeps "suff-lookup.sho" suffix is ".sho"... : 'Making suff-lookup.sho out of nothing.' : 'Making suff-lookup.c from suff-lookup.sho.' : 'Making suff-lookup.ccc from suff-lookup.c.' : 'Making suff-lookup.cc from suff-lookup.ccc.' Wildcard expanding "all"... -SuffFindDeps (.END) +SuffFindDeps ".END" No known suffix on .END. Using .NULL suffix adding suffix rules Wildcard expanding ".END"... exit status 0 diff --git a/unit-tests/suff-main-several.exp b/unit-tests/suff-main-several.exp new file mode 100644 index 000000000000..c938820c1eaf --- /dev/null +++ b/unit-tests/suff-main-several.exp @@ -0,0 +1,141 @@ +ParseReadLine (8): '.1.2 .1.3 .1.4:' +ParseDoDependency(.1.2 .1.3 .1.4:) +Setting main node to ".1.2" +ParseReadLine (9): ' : Making ${.TARGET} from ${.IMPSRC}.' +ParseReadLine (14): 'next-main:' +ParseDoDependency(next-main:) +ParseReadLine (15): ' : Making ${.TARGET}' +ParseReadLine (19): '.SUFFIXES: .1 .2 .3 .4' +ParseDoDependency(.SUFFIXES: .1 .2 .3 .4) +Adding suffix ".1" +Adding suffix ".2" +Setting main node from ".1.2" back to null +defining transformation from `.1' to `.2' +inserting ".1" (1) at end of list +inserting ".2" (2) at end of list +Setting main node to ".1.3" +Adding suffix ".3" +Setting main node from ".1.3" back to null +defining transformation from `.1' to `.3' +inserting ".1" (1) at end of list +inserting ".3" (3) at end of list +Setting main node to ".1.4" +Adding suffix ".4" +Setting main node from ".1.4" back to null +defining transformation from `.1' to `.4' +inserting ".1" (1) at end of list +inserting ".4" (4) at end of list +Setting main node to "next-main" +ParseReadLine (24): '.SUFFIXES:' +ParseDoDependency(.SUFFIXES:) +Clearing all suffixes +ParseReadLine (32): '.SUFFIXES: .4 .3 .2 .1' +ParseDoDependency(.SUFFIXES: .4 .3 .2 .1) +Adding suffix ".4" +Adding suffix ".3" +Adding suffix ".2" +Adding suffix ".1" +ParseReadLine (33): '.SUFFIXES:' +ParseDoDependency(.SUFFIXES:) +Clearing all suffixes +ParseReadLine (34): '.SUFFIXES: .1 .2 .3 .4' +ParseDoDependency(.SUFFIXES: .1 .2 .3 .4) +Adding suffix ".1" +Adding suffix ".2" +Adding suffix ".3" +Adding suffix ".4" +ParseReadLine (35): '.SUFFIXES:' +ParseDoDependency(.SUFFIXES:) +Clearing all suffixes +ParseReadLine (36): '.SUFFIXES: .4 .3 .2 .1' +ParseDoDependency(.SUFFIXES: .4 .3 .2 .1) +Adding suffix ".4" +Adding suffix ".3" +Adding suffix ".2" +Adding suffix ".1" +ParseReadLine (38): 'suff-main-several.1:' +ParseDoDependency(suff-main-several.1:) +ParseReadLine (39): ' : Making ${.TARGET} out of nothing.' +ParseReadLine (40): 'next-main: suff-main-several.{2,3,4}' +ParseDoDependency(next-main: suff-main-several.{2,3,4}) +# LinkSource: added child next-main - suff-main-several.{2,3,4} +# next-main, made UNMADE, type OP_DEPENDS|OP_HAS_COMMANDS, flags none +# suff-main-several.{2,3,4}, made UNMADE, type none, flags none +ParseReadLine (42): '.MAKEFLAGS: -d0 -dg1' +ParseDoDependency(.MAKEFLAGS: -d0 -dg1) +#*** Input graph: +# .1.2, made UNMADE, type OP_TRANSFORM, flags none +# .1.3, made UNMADE, type OP_TRANSFORM, flags none +# .1.4, made UNMADE, type OP_TRANSFORM, flags none +# next-main, made UNMADE, type OP_DEPENDS|OP_HAS_COMMANDS, flags none +# suff-main-several.1, made UNMADE, type OP_DEPENDS|OP_HAS_COMMANDS, flags none +# suff-main-several.{2,3,4}, made UNMADE, type none, flags none + + +# +# Files that are only sources: +# .1.2 [.1.2] +# .1.3 [.1.3] +# .1.4 [.1.4] +# suff-main-several.{2,3,4} [suff-main-several.{2,3,4}] +#*** Global Variables: +.ALLTARGETS = .1.2 .1.3 .1.4 next-main suff-main-several.1 suff-main-several.{2,3,4} +.CURDIR = +.INCLUDES = +.LIBS = +.MAKE =
+.MAKE.DEPENDFILE =
+.MAKE.GID =
+.MAKE.LEVEL =
+.MAKE.MAKEFILES =
+.MAKE.MAKEFILE_PREFERENCE =
+.MAKE.OS =
+.MAKE.PID =
+.MAKE.PPID =
+.MAKE.UID =
+.MAKEFLAGS = -r -k -d mps -d 0 -d g1 +.MAKEOVERRIDES = +.OBJDIR = +.PATH = . +.TARGETS = +.newline = + +MACHINE =
+MACHINE_ARCH =
+MAKE =
+MFLAGS = -r -k -d mps -d 0 -d g1 +#*** Command-line Variables: +.MAKE.LEVEL.ENV = MAKELEVEL + +#*** Directory Cache: +# Stats: 0 hits 2 misses 0 near misses 0 losers (0%) +# refs hits directory +# 1 0 +# 1 0 . + +#*** Suffixes: +# ".4" (num 1, ref 1) +# To: +# From: +# Search Path: +# ".3" (num 2, ref 1) +# To: +# From: +# Search Path: +# ".2" (num 3, ref 1) +# To: +# From: +# Search Path: +# ".1" (num 4, ref 1) +# To: +# From: +# Search Path: +#*** Transformations: +make: don't know how to make suff-main-several.2 (continuing) +make: don't know how to make suff-main-several.3 (continuing) +make: don't know how to make suff-main-several.4 (continuing) +`next-main' not remade because of errors. + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/suff-main-several.mk b/unit-tests/suff-main-several.mk new file mode 100644 index 000000000000..bcc21db5e128 --- /dev/null +++ b/unit-tests/suff-main-several.mk @@ -0,0 +1,42 @@ +# $NetBSD: suff-main-several.mk,v 1.1 2020/11/22 20:36:17 rillig Exp $ +# +# Demonstrate that an inference rule is considered the main target if its +# suffixes are not known at the point of declaration. + +.MAKEFLAGS: -dmps + +.1.2 .1.3 .1.4: + : Making ${.TARGET} from ${.IMPSRC}. + +# At this point, the above targets are normal targets. +# The target '.1.2' is now the default main target. + +next-main: + : Making ${.TARGET} + +# At this point, 'next-main' is just a regular target. + +.SUFFIXES: .1 .2 .3 .4 + +# Since the targets '.1.2', '.1.3' and '.1.4' have now been turned into +# transformation rules, 'next-main' is the default main target now. + +.SUFFIXES: # clear all + +# At this point, 'next-main' is still the default main target, even though +# it is not the first regular target anymore. + +# Define and undefine the suffixes, changing their order. +# XXX: This should have no effect, but as of 2020-11-22, it does. +# For some reason, mentioning the suffixes in reverse order disables them. +.SUFFIXES: .4 .3 .2 .1 +.SUFFIXES: # none +.SUFFIXES: .1 .2 .3 .4 +.SUFFIXES: # none +.SUFFIXES: .4 .3 .2 .1 + +suff-main-several.1: + : Making ${.TARGET} out of nothing. +next-main: suff-main-several.{2,3,4} + +.MAKEFLAGS: -d0 -dg1 diff --git a/unit-tests/suff-phony.exp b/unit-tests/suff-phony.exp new file mode 100644 index 000000000000..13f57f8ec2c6 --- /dev/null +++ b/unit-tests/suff-phony.exp @@ -0,0 +1,13 @@ +Adding suffix ".c" +defining transformation from `.c' to `' +inserting ".c" (1) at end of list +inserting "" (0) at end of list +transformation .c complete +SuffFindDeps "all" + No valid suffix on all +SuffFindDeps ".END" + No known suffix on .END. Using .NULL suffix +adding suffix rules + trying .END.c...not there +Wildcard expanding ".END"... +exit status 0 diff --git a/unit-tests/suff-phony.mk b/unit-tests/suff-phony.mk new file mode 100644 index 000000000000..f206187c7e85 --- /dev/null +++ b/unit-tests/suff-phony.mk @@ -0,0 +1,21 @@ +# $NetBSD: suff-phony.mk,v 1.1 2020/11/23 15:00:32 rillig Exp $ +# +# Test that .PHONY targets are not resolved using suffix rules. +# +# The purpose of the .PHONY attribute is to mark them as independent from the +# file system. +# +# See also: +# FindDepsRegular, Ctrl+F OP_PHONY + +.MAKEFLAGS: -ds + +all: .PHONY + +.SUFFIXES: .c + +.c: + : Making ${.TARGET} from ${.IMPSRC}. + +all.c: + : Making ${.TARGET} out of nothing. diff --git a/unit-tests/suff-rebuild.exp b/unit-tests/suff-rebuild.exp index b5bb60c23477..ccb423a6086a 100644 --- a/unit-tests/suff-rebuild.exp +++ b/unit-tests/suff-rebuild.exp @@ -1,5 +1,73 @@ -: from nothing to a -: from a to b -: from b to c -: from c to nothing +ParseReadLine (10): '.SUFFIXES:' +ParseDoDependency(.SUFFIXES:) +Clearing all suffixes +ParseReadLine (12): '.SUFFIXES: .a .b .c' +ParseDoDependency(.SUFFIXES: .a .b .c) +Adding suffix ".a" +Adding suffix ".b" +Adding suffix ".c" +ParseReadLine (14): 'suff-rebuild-example.a:' +ParseDoDependency(suff-rebuild-example.a:) +Adding "suff-rebuild-example.a" to all targets. +ParseReadLine (15): ' : Making ${.TARGET} out of nothing.' +ParseReadLine (17): '.a.b:' +ParseDoDependency(.a.b:) +defining transformation from `.a' to `.b' +inserting ".a" (1) at end of list +inserting ".b" (2) at end of list +ParseReadLine (18): ' : Making ${.TARGET} from ${.IMPSRC}.' +ParseReadLine (19): '.b.c:' +transformation .a.b complete +ParseDoDependency(.b.c:) +defining transformation from `.b' to `.c' +inserting ".b" (2) at end of list +inserting ".c" (3) at end of list +ParseReadLine (20): ' : Making ${.TARGET} from ${.IMPSRC}.' +ParseReadLine (21): '.c:' +transformation .b.c complete +ParseDoDependency(.c:) +defining transformation from `.c' to `' +inserting ".c" (3) at end of list +inserting "" (0) at end of list +ParseReadLine (22): ' : Making ${.TARGET} from ${.IMPSRC}.' +ParseReadLine (44): '.SUFFIXES: .c .b .a' +transformation .c complete +ParseDoDependency(.SUFFIXES: .c .b .a) +Adding ".END" to all targets. +Wildcard expanding "all"... +SuffFindDeps "all" + No known suffix on all. Using .NULL suffix +adding suffix rules + trying all.c...not there + trying all.b...not there + trying all.a...not there +Wildcard expanding "suff-rebuild-example"... +SuffFindDeps "suff-rebuild-example" + No known suffix on suff-rebuild-example. Using .NULL suffix +adding suffix rules + trying suff-rebuild-example.c...not there + trying suff-rebuild-example.b...not there + trying suff-rebuild-example.a...got it +Adding "suff-rebuild-example.b" to all targets. + applying .a -> .b to "suff-rebuild-example.b" +Adding "suff-rebuild-example.c" to all targets. + applying .b -> .c to "suff-rebuild-example.c" + applying .c -> to "suff-rebuild-example" +suffix is ".c"... +suffix is ".b"... +suffix is ".a"... +SuffFindDeps "suff-rebuild-example.a" +suffix is ".a"... +: Making suff-rebuild-example.a out of nothing. +: Making suff-rebuild-example.b from suff-rebuild-example.a. +: Making suff-rebuild-example.c from suff-rebuild-example.b. +: Making suff-rebuild-example from suff-rebuild-example.c. +Wildcard expanding "all"... +SuffFindDeps ".END" + No known suffix on .END. Using .NULL suffix +adding suffix rules + trying .END.c...not there + trying .END.b...not there + trying .END.a...not there +Wildcard expanding ".END"... exit status 0 diff --git a/unit-tests/suff-rebuild.mk b/unit-tests/suff-rebuild.mk index d190eaf4c6e8..a1ce89402a01 100644 --- a/unit-tests/suff-rebuild.mk +++ b/unit-tests/suff-rebuild.mk @@ -1,33 +1,44 @@ -# $NetBSD: suff-rebuild.mk,v 1.2 2020/10/18 16:12:39 rillig Exp $ +# $NetBSD: suff-rebuild.mk,v 1.6 2020/11/21 12:01:16 rillig Exp $ # # Demonstrates what happens to transformation rules (called inference rules # by POSIX) when all suffixes are deleted. all: suff-rebuild-example +.MAKEFLAGS: -dpst + .SUFFIXES: .SUFFIXES: .a .b .c suff-rebuild-example.a: - : from nothing to a + : Making ${.TARGET} out of nothing. .a.b: - : from a to b + : Making ${.TARGET} from ${.IMPSRC}. .b.c: - : from b to c + : Making ${.TARGET} from ${.IMPSRC}. .c: - : from c to nothing + : Making ${.TARGET} from ${.IMPSRC}. -# XXX: At a quick glance, the code in SuffScanTargets looks as if it were +# XXX: At a quick glance, the code in SuffUpdateTarget looks as if it were # possible to delete the suffixes in the middle of the makefile, add back # the suffixes from before, and have the transformation rules preserved. # # As of 2020-09-25, uncommenting the following line results in the error # message "don't know how to make suff-rebuild-example" though. # +# If this is a bug, the actual cause is probably that when a suffix +# transformation rule is defined, it is not added to the global list of +# targets, see Suff_EndTransform. Later, UpdateTargets iterates over exactly +# this global list of targets though. +# +# If UpdateTargets were to iterate over 'transforms' as well, it still +# wouldn't work because the condition 'ptr == target->name' skips these +# transformation rules. + #.SUFFIXES: # Add the suffixes back. It should not matter that the order of the suffixes # is different from before. .SUFFIXES: .c .b .a diff --git a/unit-tests/suff-self.exp b/unit-tests/suff-self.exp index 4e70762209a2..6192c508ab96 100644 --- a/unit-tests/suff-self.exp +++ b/unit-tests/suff-self.exp @@ -1,3 +1,6 @@ make: Graph cycles through suff-self.suff `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/suff-transform-debug.exp b/unit-tests/suff-transform-debug.exp new file mode 100644 index 000000000000..70181be4b97f --- /dev/null +++ b/unit-tests/suff-transform-debug.exp @@ -0,0 +1,62 @@ +#*** Input graph: +# all, made UNMADE, type OP_DEPENDS, flags none + + +# +# Files that are only sources: +#*** Global Variables: +.ALLTARGETS = all +.CURDIR = +.INCLUDES = +.LIBS = +.MAKE =
+.MAKE.DEPENDFILE =
+.MAKE.GID =
+.MAKE.LEVEL =
+.MAKE.MAKEFILES =
+.MAKE.MAKEFILE_PREFERENCE =
+.MAKE.OS =
+.MAKE.PID =
+.MAKE.PPID =
+.MAKE.UID =
+.MAKEFLAGS = -r -k -d g1 +.MAKEOVERRIDES = +.OBJDIR = +.PATH = . +.TARGETS = +.newline = + +MACHINE =
+MACHINE_ARCH =
+MAKE =
+MFLAGS = -r -k -d g1 +#*** Command-line Variables: +.MAKE.LEVEL.ENV = MAKELEVEL + +#*** Directory Cache: +# Stats: 0 hits 2 misses 0 near misses 0 losers (0%) +# refs hits directory +# 1 0 +# 1 0 . + +#*** Suffixes: +# ".a" (num 1, ref 2) +# To: +# From: .cpp +# Search Path: +# ".c" (num 2, ref 2) +# To: .cpp +# From: +# Search Path: +# ".cpp" (num 3, ref 3) +# To: .a +# From: .c +# Search Path: +#*** Transformations: +.c.cpp : + : Making ${.TARGET} from impsrc ${.IMPSRC} allsrc ${.ALLSRC}. + +.cpp.a : + : Making ${.TARGET} from impsrc ${.IMPSRC} allsrc ${.ALLSRC}. + +exit status 0 diff --git a/unit-tests/suff-transform-debug.mk b/unit-tests/suff-transform-debug.mk new file mode 100644 index 000000000000..d206a0f691a2 --- /dev/null +++ b/unit-tests/suff-transform-debug.mk @@ -0,0 +1,12 @@ +# $NetBSD: suff-transform-debug.mk,v 1.1 2020/11/22 23:45:20 rillig Exp $ +# +# Test how the debug output of transformation rules looks. + +.MAKEFLAGS: -dg1 + +.SUFFIXES: .a .c .cpp + +.c.cpp .cpp.a: + : Making ${.TARGET} from impsrc ${.IMPSRC} allsrc ${.ALLSRC}. + +all: diff --git a/unit-tests/suff-transform-endless.exp b/unit-tests/suff-transform-endless.exp index 5cd267306b92..620c46626e22 100644 --- a/unit-tests/suff-transform-endless.exp +++ b/unit-tests/suff-transform-endless.exp @@ -1,4 +1,46 @@ -make: "suff-transform-endless.mk" line 36: prevent endless loop +Adding suffix ".c" +Adding suffix ".d" +defining transformation from `.c' to `.d' +inserting ".c" (1) at end of list +inserting ".d" (2) at end of list +Adding suffix ".e" +defining transformation from `.d' to `.e' +inserting ".d" (2) at end of list +inserting ".e" (3) at end of list +Adding suffix ".f" +defining transformation from `.e' to `' +inserting ".e" (3) at end of list +inserting "" (0) at end of list +defining transformation from `.e' to `.f' +inserting ".e" (3) at end of list +inserting ".f" (4) at end of list +defining transformation from `.f' to `.e' +inserting ".f" (4) at end of list +inserting ".e" (3) at end of list +transformation .e complete +transformation .e.f complete +transformation .f.e complete +Wildcard expanding "all"... +SuffFindDeps "all" + No known suffix on all. Using .NULL suffix +adding suffix rules + trying all.e...not there + trying all.d...not there + trying all.f...not there + trying all.c...not there + trying all.e...not there +FindThem: skipping duplicate "all.e" +Wildcard expanding "issue6.f"...suffix is ".f"... +SuffFindDeps "issue6.f" + trying issue6.e...not there + trying issue6.d...not there + trying issue6.f...got it + applying .f -> .e to "issue6.e" + applying .e -> .f to "issue6.f" +suffix is ".e"... +make: Graph cycles through issue6.f +`all' not remade because of errors. +Stop. make: stopped in unit-tests exit status 1 diff --git a/unit-tests/suff-transform-endless.mk b/unit-tests/suff-transform-endless.mk index 546e24f398ad..d3b1cf24d8aa 100644 --- a/unit-tests/suff-transform-endless.mk +++ b/unit-tests/suff-transform-endless.mk @@ -1,36 +1,39 @@ -# $NetBSD: suff-transform-endless.mk,v 1.1 2020/10/20 20:36:53 rillig Exp $ +# $NetBSD: suff-transform-endless.mk,v 1.4 2020/11/23 14:47:12 rillig Exp $ # https://gnats.netbsd.org/49086, issue 6: # Transformation search can end up in an infinite loop. # # There is no file or target from which issue6.f could be made, so # this should fail. The bug is that because rules .e.f, .d.e and .e.d # exist, make would try to make .f from .e and then infinitely try # to do .e from .d and vice versa. +.MAKEFLAGS: -ds + all: issue6.f .c.d .d.c .d .d.e .e.d: : 'Making ${.TARGET} from ${.IMPSRC}.' .SUFFIXES: .c .d .e .f .e .e.f .f.e: - : 'Making ${.TARGET} out of nothing.' + : 'Making ${.TARGET} from ${.IMPSRC}.' # XXX: As of 2020-10-20, the result is unexpected. # XXX: .d.c is not a transformation rule. # XXX: .d is not a transformation rule. # XXX: .e.d is not a transformation rule. # XXX: .c.d is listed as "Files that are only sources". # XXX: .d.e is listed as "Files that are only sources". # XXX: The suffixes .d and .f both have the number 3. # XXX: .c.d is not listed as "Transformations". # XXX: .d.c is not listed as "Transformations". # XXX: .d is not listed as "Transformations". # XXX: .d.e is not listed as "Transformations". # XXX: .e.d is not listed as "Transformations". # XXX: Found 'all' as '(not found)' # XXX: trying all.e, all.e, all.f, all.e, all.e, repeatedly. #.MAKEFLAGS: -dg1 -.error prevent endless loop + +# Before 24-11-2020, resolving all.e ran into an endless loop. diff --git a/unit-tests/suff-transform-expand.exp b/unit-tests/suff-transform-expand.exp index 178e264769af..c1821852707d 100644 --- a/unit-tests/suff-transform-expand.exp +++ b/unit-tests/suff-transform-expand.exp @@ -1,5 +1,8 @@ : 'Making issue11.h out of nothing.' make: don't know how to make .first (continuing) : 'Making issue11.second out of nothing.' `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/suff-transform-select.exp b/unit-tests/suff-transform-select.exp index 8470ba3853dc..29065154c891 100644 --- a/unit-tests/suff-transform-select.exp +++ b/unit-tests/suff-transform-select.exp @@ -1,4 +1,47 @@ -make: "suff-transform-select.mk" line 28: prevent endless loop +Adding suffix ".c" +Adding suffix ".d" +defining transformation from `.c' to `.d' +inserting ".c" (1) at end of list +inserting ".d" (2) at end of list +Adding suffix ".e" +defining transformation from `.d' to `.e' +inserting ".d" (2) at end of list +inserting ".e" (3) at end of list +Adding suffix ".f" +Adding suffix ".g" +defining transformation from `.e' to `' +inserting ".e" (3) at end of list +inserting "" (0) at end of list +defining transformation from `.e' to `.f' +inserting ".e" (3) at end of list +inserting ".f" (4) at end of list +defining transformation from `.f' to `.e' +inserting ".f" (4) at end of list +inserting ".e" (3) at end of list +transformation .e complete +transformation .e.f complete +transformation .f.e complete +Wildcard expanding "all"... +SuffFindDeps "all" + No known suffix on all. Using .NULL suffix +adding suffix rules + trying all.e...not there + trying all.d...not there + trying all.f...not there + trying all.c...not there + trying all.e...not there +FindThem: skipping duplicate "all.e" +Wildcard expanding "issue10.e"...suffix is ".e"... +SuffFindDeps "issue10.e" + trying issue10.d...got it +suffix is ".d"... +SuffFindDeps "issue10.d" + trying issue10.c...not there +suffix is ".d"... +: 'Making issue10.d out of nothing.' +make: don't know how to make issue10.e (continuing) +`all' not remade because of errors. +Stop. make: stopped in unit-tests exit status 1 diff --git a/unit-tests/suff-transform-select.mk b/unit-tests/suff-transform-select.mk index d4ae37086e84..a5af089d7714 100644 --- a/unit-tests/suff-transform-select.mk +++ b/unit-tests/suff-transform-select.mk @@ -1,28 +1,31 @@ -# $NetBSD: suff-transform-select.mk,v 1.1 2020/10/20 20:36:53 rillig Exp $ +# $NetBSD: suff-transform-select.mk,v 1.3 2020/11/23 14:47:12 rillig Exp $ # # https://gnats.netbsd.org/49086, issue 10: # Explicit dependencies affect transformation rule selection. # # If issue10.e is wanted and both issue10.d and issue10.f are available, # make should choose the .d.e rule, because .d is before .f in .SUFFIXES. # The bug was that if issue10.d had an explicit dependency on issue10.f, # it would choose .f.e instead. +.MAKEFLAGS: -ds + _!= rm -f issue10.* all: issue10.e .c.d .d.c .d .d.e .e.d: : 'Making ${.TARGET} from ${.IMPSRC} (first set).' .SUFFIXES: .c .d .e .f .g .e .e.f .f.e: : 'Making ${.TARGET} from ${.IMPSRC} (second set).' issue10.d issue10.f: : 'Making ${.TARGET} out of nothing.' # XXX: see suff-bug-endless, which must be fixed first. #.MAKEFLAGS: -dg1 -.error prevent endless loop + +# Before 24-11-2020, resolving all.e ran into an endless loop. diff --git a/unit-tests/use-inference.exp b/unit-tests/use-inference.exp index 14ecf0550574..135deabc918e 100644 --- a/unit-tests/use-inference.exp +++ b/unit-tests/use-inference.exp @@ -1,4 +1,7 @@ Building use-inference.from from nothing make: don't know how to make use-inference.to (continuing) `all' not remade because of errors. -exit status 0 + +Stop. +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/use-inference.mk b/unit-tests/use-inference.mk index cde3c772edaa..550331a54d97 100644 --- a/unit-tests/use-inference.mk +++ b/unit-tests/use-inference.mk @@ -1,38 +1,38 @@ -# $NetBSD: use-inference.mk,v 1.2 2020/11/05 00:41:04 rillig Exp $ +# $NetBSD: use-inference.mk,v 1.3 2020/12/07 00:53:30 rillig Exp $ # # Demonstrate that .USE rules do not have an effect on inference rules. # At least not in the special case where the inference rule does not # have any associated commands. .SUFFIXES: .SUFFIXES: .from .to all: use-inference.to verbose: .USE @echo 'Verbosely making $@ out of $>' .from.to: verbose # Since this inference rule does not have any associated commands, it # is ignored. # # @echo 'Building $@ from $<' use-inference.from: # assume it exists @echo 'Building $@ from nothing' # Possible but unproven explanation: # # The main target is "all", which depends on "use-inference.to". # The inference connects the .from to the .to file, otherwise make # would not know that the .from file would need to be built. # # The .from file is then built. # # After this, make stops since it doesn't know how to make the .to file. # This is strange since make definitely knows about the .from.to suffix # inference rule. But it seems to ignore it, maybe because it doesn't # have any associated commands. -# XXX: Despite the error message "don't know how to make", the exit status -# is 0. This is inconsistent. +# Until 2020-12-07, despite the error message "don't know how to make", +# the exit status was 0. This was inconsistent. diff --git a/unit-tests/var-op-default.mk b/unit-tests/var-op-default.mk index afb0c55f827c..ca4fbcc27c88 100644 --- a/unit-tests/var-op-default.mk +++ b/unit-tests/var-op-default.mk @@ -1,9 +1,77 @@ -# $NetBSD: var-op-default.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: var-op-default.mk,v 1.3 2020/12/07 21:35:43 rillig Exp $ # # Tests for the ?= variable assignment operator, which only assigns # if the variable is still undefined. -# TODO: Implementation +# The variable VAR is not defined yet. Therefore it gets the default value +# from the variable assignment. +VAR?= default value +.if ${VAR} != "default value" +. error +.endif + +# At this point, the variable 'VAR' is already defined. The '?=' therefore +# ignores the new variable value, preserving the previous "default value". +VAR?= ignored +.if ${VAR} != "default value" +. error +.endif + +# The '?=' operator only checks whether the variable is defined or not. +# An empty variable is defined, therefore the '?=' operator does nothing. +EMPTY= # empty +EMPTY?= ignored +.if ${EMPTY} != "" +. error +.endif + +# The .for loop is described in the manual page as if it would operate on +# variables. This is not entirely true. Instead, each occurrence of an +# expression $i or ${i} or ${i:...} is substituted with ${:Uloop-value}. +# This comes very close to the description, the only difference is that +# there is never an actual variable named 'i' involved. +# +# Because there is not really a variable named 'i', the '?=' operator +# performs the variable assignment, resulting in $i == "default". +.for i in loop-value +i?= default +.endfor +.if ${i} != "default" +. error +.endif + +# At the point where the '?=' operator checks whether the variable exists, +# it expands the variable name exactly once. Therefore both 'VAR.param' +# and 'VAR.${param}' expand to 'VAR.param', and the second '?=' assignment +# has no effect. +# +# Since 2000.05.11.07.43.42 it has been possible to use nested variable +# expressions in variable names, which made make much more versatile. +# On 2008.03.31.00.12.21, this particular case of the '?=' operator has been +# fixed. Before, the '?=' operator had not expanded the variable name +# 'VAR.${:Uparam}' to see whether the variable already existed. Since that +# variable didn't exist (and variables with '$' in their name are particularly +# fragile), the variable assignment with "not used" was performed, and only +# during that, the variable name was expanded. +VAR.param= already defined +VAR.${:Uparam}?= not used +.if ${VAR.param} != "already defined" +. error +.endif + +# Now demonstrate that the variable name is indeed expanded exactly once. +# This is tricky to measure correctly since there are many inconsistencies +# in and around the code that expands variable expressions in the various +# places where variable expressions can occur. If in doubt, enable the +# following debug flags to see what happens: +#.MAKEFLAGS: -dcpv +EXPAND_NAME= EXPAND.$$$$ # The full variable name is EXPAND.$$ +PARAM= $$$$ +EXPAND.${PARAM}?= value with param +.if ${${EXPAND_NAME}} != "value with param" +. error +.endif +.MAKEFLAGS: -d0 all: @:; diff --git a/unit-tests/var-op-expand.exp b/unit-tests/var-op-expand.exp index 8ccbbd5ae92d..39a9383953dd 100644 --- a/unit-tests/var-op-expand.exp +++ b/unit-tests/var-op-expand.exp @@ -1,10 +1 @@ -Var_Parse: ${UNDEF} with VARE_WANTRES -Global:VAR_ASSIGN_ = undef value -Var_Parse: ${UNDEF} with VARE_WANTRES -Var_Parse: ${UNDEF} with VARE_WANTRES -Global:VAR_SUBST_${UNDEF} = -Var_Parse: ${UNDEF} with VARE_WANTRES -Global:VAR_SUBST_ = undef value -Global:.MAKEFLAGS = -r -k -d v -d -Global:.MAKEFLAGS = -r -k -d v -d 0 exit status 0 diff --git a/unit-tests/var-op-expand.mk b/unit-tests/var-op-expand.mk index 0b5ddbbc0386..ff62668a8ada 100644 --- a/unit-tests/var-op-expand.mk +++ b/unit-tests/var-op-expand.mk @@ -1,27 +1,178 @@ -# $NetBSD: var-op-expand.mk,v 1.4 2020/11/08 14:00:52 rillig Exp $ +# $NetBSD: var-op-expand.mk,v 1.11 2021/01/01 23:07:48 sjg Exp $ # # Tests for the := variable assignment operator, which expands its # right-hand side. -# TODO: Implementation - -# XXX: edge case: When a variable name refers to an undefined variable, the -# behavior differs between the '=' and the ':=' assignment operators. -# This bug exists since var.c 1.42 from 2000-05-11. -# -# The '=' operator expands the undefined variable to an empty string, thus -# assigning to VAR_ASSIGN_. In the name of variables to be set, it should -# really be forbidden to refer to undefined variables. -# -# The ':=' operator expands the variable name twice. In one of these -# expansions, the undefined variable expression is preserved (controlled by -# preserveUndefined in VarAssign_EvalSubst), in the other expansion it expands -# to an empty string. This way, 2 variables are created using a single -# variable assignment. It's magic. :-/ -.MAKEFLAGS: -dv -VAR_ASSIGN_${UNDEF}= undef value -VAR_SUBST_${UNDEF}:= undef value -.MAKEFLAGS: -d0 +.MAKE.SAVE_DOLLARS:= yes + +# If the right-hand side does not contain a dollar sign, the ':=' assignment +# operator has the same effect as the '=' assignment operator. +VAR:= value +.if ${VAR} != "value" +. error +.endif + +# When a ':=' assignment is performed, its right-hand side is evaluated and +# expanded as far as possible. Contrary to other situations, '$$' and +# variable expressions based on undefined variables are preserved though. +# +# Whether a variable expression is undefined or not is determined at the end +# of evaluating the expression. The consequence is that ${:Ufallback} expands +# to "fallback"; initially this expression is undefined since it is based on +# the variable named "", which is guaranteed to be never defined, but at the +# end of evaluating the expression ${:Ufallback}, the modifier ':U' has turned +# the expression into a defined expression. + + +# literal dollar signs +VAR:= $$ $$$$ $$$$$$$$ +.if ${VAR} != "\$ \$\$ \$\$\$\$" +. error +.endif + + +# reference to a variable containing a literal dollar sign +REF= $$ $$$$ $$$$$$$$ +VAR:= ${REF} +REF= too late +.if ${VAR} != "\$ \$\$ \$\$\$\$" +. error +.endif + + +# reference to an undefined variable +.undef UNDEF +VAR:= <${UNDEF}> +UNDEF= after +.if ${VAR} != "" +. error +.endif + + +# reference to a variable whose name is computed from another variable +REF2= referred to +REF= REF2 +VAR:= ${${REF}} +REF= too late +.if ${VAR} != "referred to" +. error +.endif + + +# expression with an indirect modifier referring to an undefined variable +.undef UNDEF +VAR:= ${:${UNDEF}} +UNDEF= Uwas undefined +.if ${VAR} != "was undefined" +. error +.endif + + +# expression with an indirect modifier referring to another variable that +# in turn refers to an undefined variable +# +# XXX: Even though this is a ':=' assignment, the '${UNDEF}' in the part of +# the variable modifier is not preserved. To preserve it, ParseModifierPart +# would have to call VarSubstExpr somehow since this is the only piece of +# code that takes care of this global variable. +.undef UNDEF +REF= U${UNDEF} +#.MAKEFLAGS: -dv +VAR:= ${:${REF}} +#.MAKEFLAGS: -d0 +REF= too late +UNDEF= Uwas undefined +.if ${VAR} != "" +. error +.endif + + +# In variable assignments using the ':=' operator, undefined variables are +# preserved, no matter how indirectly they are referenced. +.undef REF3 +REF2= <${REF3}> +REF= ${REF2} +VAR:= ${REF} +REF3= too late +.if ${VAR} != "" +. error +.endif + + +# In variable assignments using the ':=' operator, '$$' are preserved, no +# matter how indirectly they are referenced. +REF2= REF2:$$ $$$$ +REF= REF:$$ $$$$ ${REF2} +VAR:= VAR:$$ $$$$ ${REF} +.if ${VAR} != "VAR:\$ \$\$ REF:\$ \$\$ REF2:\$ \$\$" +. error +.endif + + +# In variable assignments using the ':=' operator, '$$' are preserved in the +# expressions of the top level, but not in expressions that are nested. +VAR:= top:$$ ${:Unest1\:\$\$} ${:Unest2${:U\:\$\$}} +.if ${VAR} != "top:\$ nest1:\$ nest2:\$" +. error +.endif + + +# In variable assignments using the ':=' operator, there may be expressions +# containing variable modifiers, and these modifiers may refer to other +# variables. These referred-to variables are expanded at the time of +# assignment. The undefined variables are kept as-is and are later expanded +# when evaluating the condition. +# +# Contrary to the assignment operator '=', the assignment operator ':=' +# consumes the '$' from modifier parts. +REF.word= 1:$$ 2:$$$$ 4:$$$$$$$$ +.undef REF.undef +VAR:= ${:Uword undef:@word@${REF.${word}}@}, direct: ${REF.word} ${REF.undef} +REF.word= word.after +REF.undef= undef.after +.if ${VAR} != "1:2:\$ 4:\$\$ undef.after, direct: 1:\$ 2:\$\$ 4:\$\$\$\$ undef.after" +. error +.endif + +# Just for comparison, the previous example using the assignment operator '=' +# instead of ':='. The right-hand side of the assignment is not evaluated at +# the time of assignment but only later, when ${VAR} appears in the condition. +# +# At that point, both REF.word and REF.undef are defined. +REF.word= 1:$$ 2:$$$$ 4:$$$$$$$$ +.undef REF.undef +VAR= ${:Uword undef:@word@${REF.${word}}@}, direct: ${REF.word} ${REF.undef} +REF.word= word.after +REF.undef= undef.after +.if ${VAR} != "word.after undef.after, direct: word.after undef.after" +. error +.endif + + +# Between var.c 1.42 from 2000-05-11 and before parse.c 1.520 from 2020-12-27, +# if the variable name in a ':=' assignment referred to an undefined variable, +# there were actually 2 assignments to different variables: +# +# Global["VAR_SUBST_${UNDEF}"] = "" +# Global["VAR_SUBST_"] = "" +# +# The variable name with the empty value actually included a dollar sign. +# Variable names with dollars are not used in practice. +# +# It might be a good idea to forbid undefined variables on the left-hand side +# of a variable assignment. +.undef UNDEF +VAR_ASSIGN_${UNDEF}= assigned by '=' +VAR_SUBST_${UNDEF}:= assigned by ':=' +.if ${VAR_ASSIGN_} != "assigned by '='" +. error +.endif +.if defined(${:UVAR_SUBST_\${UNDEF\}}) +. error +.endif +.if ${VAR_SUBST_} != "assigned by ':='" +. error +.endif all: @:; diff --git a/unit-tests/vardebug.exp b/unit-tests/vardebug.exp index 06c8b590e1b1..cd89e81b3923 100644 --- a/unit-tests/vardebug.exp +++ b/unit-tests/vardebug.exp @@ -1,86 +1,86 @@ Global:delete FROM_CMDLINE (not found) Command:FROM_CMDLINE = Global:.MAKEOVERRIDES = FROM_CMDLINE Global:VAR = added Global:VAR = overwritten Global:delete VAR Global:delete VAR (not found) Var_Parse: ${:U} with VARE_WANTRES Applying ${:U} to "" (VARE_WANTRES, none, VEF_UNDEF) Result of ${:U} is "" (VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Var_Set("${:U}", "empty name", ...) name expands to empty string - ignored Var_Parse: ${:U} with VARE_WANTRES Applying ${:U} to "" (VARE_WANTRES, none, VEF_UNDEF) Result of ${:U} is "" (VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Var_Append("${:U}", "empty name", ...) name expands to empty string - ignored Global:FROM_CMDLINE = overwritten ignored! Global:VAR = 1 Global:VAR = 1 2 Global:VAR = 1 2 3 Var_Parse: ${VAR:M[2]} with VARE_UNDEFERR|VARE_WANTRES Applying ${VAR:M...} to "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Pattern[VAR] for [1 2 3] is [[2]] ModifyWords: split "1 2 3" into 3 words VarMatch [1] [[2]] VarMatch [2] [[2]] VarMatch [3] [[2]] Result of ${VAR:M[2]} is "2" (VARE_UNDEFERR|VARE_WANTRES, none, none) Var_Parse: ${VAR:N[2]} with VARE_UNDEFERR|VARE_WANTRES Applying ${VAR:N...} to "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Pattern[VAR] for [1 2 3] is [[2]] ModifyWords: split "1 2 3" into 3 words Result of ${VAR:N[2]} is "1 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Var_Parse: ${VAR:S,2,two,} with VARE_UNDEFERR|VARE_WANTRES Applying ${VAR:S...} to "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Modifier part: "2" Modifier part: "two" ModifyWords: split "1 2 3" into 3 words Result of ${VAR:S,2,two,} is "1 two 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Var_Parse: ${VAR:Q} with VARE_UNDEFERR|VARE_WANTRES Applying ${VAR:Q} to "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Result of ${VAR:Q} is "1\ 2\ 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Var_Parse: ${VAR:tu:tl:Q} with VARE_UNDEFERR|VARE_WANTRES Applying ${VAR:t...} to "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Result of ${VAR:tu} is "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Applying ${VAR:t...} to "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Result of ${VAR:tl} is "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Applying ${VAR:Q} to "1 2 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Result of ${VAR:Q} is "1\ 2\ 3" (VARE_UNDEFERR|VARE_WANTRES, none, none) Var_Parse: ${:Uvalue:${:UM*e}:Mvalu[e]} with VARE_UNDEFERR|VARE_WANTRES Applying ${:U...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF) Result of ${:Uvalue} is "value" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Var_Parse: ${:UM*e}:Mvalu[e]} with VARE_UNDEFERR|VARE_WANTRES Applying ${:U...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF) Result of ${:UM*e} is "M*e" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Indirect modifier "M*e" from "${:UM*e}" Applying ${:M...} to "value" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Pattern[] for [value] is [*e] ModifyWords: split "value" into 1 words VarMatch [value] [*e] Result of ${:M*e} is "value" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Applying ${:M...} to "value" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Pattern[] for [value] is [valu[e]] ModifyWords: split "value" into 1 words VarMatch [value] [valu[e]] Result of ${:Mvalu[e]} is "value" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Var_Parse: ${:UVAR} with VARE_WANTRES Applying ${:U...} to "" (VARE_WANTRES, none, VEF_UNDEF) Result of ${:UVAR} is "VAR" (VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Global:delete VAR Var_Parse: ${:Uvariable:unknown} with VARE_UNDEFERR|VARE_WANTRES Applying ${:U...} to "" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF) Result of ${:Uvariable} is "variable" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) Applying ${:u...} to "variable" (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) -make: Unknown modifier 'u' +make: "vardebug.mk" line 44: Unknown modifier 'u' Result of ${:unknown} is error (VARE_UNDEFERR|VARE_WANTRES, none, VEF_UNDEF|VEF_DEF) make: "vardebug.mk" line 44: Malformed conditional (${:Uvariable:unknown}) Var_Parse: ${UNDEFINED} with VARE_UNDEFERR|VARE_WANTRES make: "vardebug.mk" line 53: Malformed conditional (${UNDEFINED}) Global:delete .SHELL (not found) Command:.SHELL = Command:.SHELL = overwritten ignored (read-only) Global:.MAKEFLAGS = -r -k -d v -d Global:.MAKEFLAGS = -r -k -d v -d 0 make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/varmisc.mk b/unit-tests/varmisc.mk index aced1a0554d1..607c8d7e0ed3 100644 --- a/unit-tests/varmisc.mk +++ b/unit-tests/varmisc.mk @@ -1,228 +1,218 @@ -# $Id: varmisc.mk,v 1.21 2020/11/11 23:08:50 sjg Exp $ -# $NetBSD: varmisc.mk,v 1.28 2020/11/07 00:07:02 rillig Exp $ +# $Id: varmisc.mk,v 1.22 2020/11/30 19:27:41 sjg Exp $ +# $NetBSD: varmisc.mk,v 1.29 2020/11/28 14:08:37 rillig Exp $ # # Miscellaneous variable tests. all: unmatched_var_paren D_true U_true D_false U_false Q_lhs Q_rhs NQ_none \ strftime cmpv manok all: save-dollars all: export-appended all: parse-dynamic all: varerror-unclosed unmatched_var_paren: @echo ${foo::=foo-text} True= ${echo true >&2:L:sh}TRUE False= ${echo false >&2:L:sh}FALSE VSET= is set .undef UNDEF U_false: @echo :U skipped when var set @echo ${VSET:U${False}} D_false: @echo :D skipped if var undef @echo ${UNDEF:D${False}} U_true: @echo :U expanded when var undef @echo ${UNDEF:U${True}} D_true: @echo :D expanded when var set @echo ${VSET:D${True}} Q_lhs: @echo :? only lhs when value true @echo ${1:L:?${True}:${False}} Q_rhs: @echo :? only rhs when value false @echo ${0:L:?${True}:${False}} NQ_none: @echo do not evaluate or expand :? if discarding @echo ${VSET:U${1:L:?${True}:${False}}} April1= 1459494000 # slightly contorted syntax to use utc via variable strftime: @echo ${year=%Y month=%m day=%d:L:gmtime=1459494000} @echo date=${%Y%m%d:L:${gmtime=${April1}:L}} # big jumps to handle 3 digits per step M_cmpv.units= 1 1000 1000000 M_cmpv= S,., ,g:_:range:@i@+ $${_:[-$$i]} \* $${M_cmpv.units:[$$i]}@:S,^,expr 0 ,1:sh Version= 123.456.789 cmpv.only= target specific vars cmpv: @echo Version=${Version} == ${Version:${M_cmpv}} @echo Literal=3.4.5 == ${3.4.5:L:${M_cmpv}} @echo We have ${${.TARGET:T}.only} # catch misshandling of nested vars in .for loop MAN= MAN1= make.1 .for s in 1 2 . if defined(MAN$s) && !empty(MAN$s) MAN+= ${MAN$s} . endif .endfor manok: @echo MAN=${MAN} -# This is an expanded variant of the above .for loop. -# Between 2020-06-28 and 2020-07-02 this paragraph generated a wrong -# error message "Variable VARNAME is recursive". -# When evaluating the !empty expression, the ${:U1} was not expanded and -# thus resulted in the seeming definition VARNAME=${VARNAME}, which is -# obviously recursive. -VARNAME= ${VARNAME${:U1}} -.if defined(VARNAME${:U2}) && !empty(VARNAME${:U2}) -.endif - # begin .MAKE.SAVE_DOLLARS; see Var_SetWithFlags and ParseBoolean. SD_VALUES= 0 1 2 False True false true Yes No yes no On Off ON OFF on off SD_4_DOLLARS= $$$$ .for val in ${SD_VALUES} .MAKE.SAVE_DOLLARS:= ${val} # Must be := since a simple = has no effect. SD.${val}:= ${SD_4_DOLLARS} .endfor .MAKE.SAVE_DOLLARS:= yes save-dollars: .for val in ${SD_VALUES} @printf '%s: %-8s = %s\n' $@ ${val} ${SD.${val}:Q} .endfor # Appending to an undefined variable does not add a space in front. .undef APPENDED APPENDED+= value .if ${APPENDED} != "value" . error "${APPENDED}" .endif # Appending to an empty variable adds a space between the old value # and the additional value. APPENDED= # empty APPENDED+= value .if ${APPENDED} != " value" . error "${APPENDED}" .endif # Appending to parameterized variables works as well. PARAM= param VAR.${PARAM}= 1 VAR.${PARAM}+= 2 .if ${VAR.param} != "1 2" . error "${VAR.param}" .endif # The variable name can contain arbitrary characters. # If the expanded variable name ends in a +, this still does not influence # the parser. The assignment operator is still a simple assignment. # Therefore, there is no need to add a space between the variable name # and the assignment operator. PARAM= + VAR.${PARAM}= 1 VAR.${PARAM}+= 2 .if ${VAR.+} != "1 2" . error "${VAR.+}" .endif .for param in + ! ? VAR.${param}= ${param} .endfor .if ${VAR.+} != "+" || ${VAR.!} != "!" || ${VAR.?} != "?" . error "${VAR.+}" "${VAR.!}" "${VAR.?}" .endif # Appending to a variable from the environment creates a copy of that variable # in the global context. # The appended value is not exported automatically. # When a variable is exported, the exported value is taken at the time of the # .export directive. Later changes to the variable have no effect. .export FROM_ENV_BEFORE FROM_ENV+= mk FROM_ENV_BEFORE+= mk FROM_ENV_AFTER+= mk .export FROM_ENV_AFTER export-appended: @echo $@: "$$FROM_ENV" @echo $@: "$$FROM_ENV_BEFORE" @echo $@: "$$FROM_ENV_AFTER" # begin parse-dynamic # # Demonstrate that the target-specific variables are not evaluated in # the global context. They are preserved until there is a local context # in which resolving them makes sense. # There are different code paths for short names ... ${:U>}= before GS_TARGET:= $@ GS_MEMBER:= $% GS_PREFIX:= $* GS_ARCHIVE:= $! GS_ALLSRC:= $> ${:U>}= after # ... and for braced short names ... GB_TARGET:= ${@} GB_MEMBER:= ${%} GB_PREFIX:= ${*} GB_ARCHIVE:= ${!} GB_ALLSRC:= ${>} # ... and for long names. GL_TARGET:= ${.TARGET} GL_MEMBER:= ${.MEMBER} GL_PREFIX:= ${.PREFIX} GL_ARCHIVE:= ${.ARCHIVE} GL_ALLSRC:= ${.ALLSRC} parse-dynamic: @echo $@: ${GS_TARGET} ${GS_MEMBER} ${GS_PREFIX} ${GS_ARCHIVE} ${GS_ALLSRC} @echo $@: ${GB_TARGET} ${GB_MEMBER} ${GB_PREFIX} ${GB_ARCHIVE} ${GB_ALLSRC} @echo $@: ${GL_TARGET} ${GL_MEMBER} ${GL_PREFIX} ${GL_ARCHIVE} ${GL_ALLSRC} # Since 2020-07-28, make complains about unclosed variables. # Before that, it had complained about unclosed variables only when # parsing the modifiers, but not when parsing the variable name. UNCLOSED_INDIR_1= ${UNCLOSED_ORIG UNCLOSED_INDIR_2= ${UNCLOSED_INDIR_1} FLAGS= one two FLAGS+= ${FLAGS.${.ALLSRC:M*.c:T:u}} FLAGS.target2.c= three four target1.c: target2.c: all: target1-flags target2-flags target1-flags: target1.c @echo $@: we have: ${FLAGS} target2-flags: target2.c @echo $@: we have: ${FLAGS} varerror-unclosed: @echo $@:begin @echo $( @echo $(UNCLOSED @echo ${UNCLOSED @echo ${UNCLOSED:M${PATTERN @echo ${UNCLOSED.${param @echo $ .for i in 1 2 3 @echo ${UNCLOSED.${i} .endfor @echo ${UNCLOSED_INDIR_2} @echo $@:end diff --git a/unit-tests/varmod-defined.exp b/unit-tests/varmod-defined.exp index 7f61cc426305..15f40226f1db 100644 --- a/unit-tests/varmod-defined.exp +++ b/unit-tests/varmod-defined.exp @@ -1,23 +1,23 @@ Global:8_DOLLARS = $$$$$$$$ Global:VAR = -Var_Parse: ${8_DOLLARS} with VARE_WANTRES|VARE_KEEP_DOLLAR +Var_Parse: ${8_DOLLARS} with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF Global:VAR = $$$$$$$$ -Var_Parse: ${VAR:D${8_DOLLARS}} with VARE_WANTRES|VARE_KEEP_DOLLAR -Applying ${VAR:D...} to "$$$$$$$$" (VARE_WANTRES|VARE_KEEP_DOLLAR, none, none) -Var_Parse: ${8_DOLLARS}} with VARE_WANTRES|VARE_KEEP_DOLLAR -Result of ${VAR:D${8_DOLLARS}} is "$$$$$$$$" (VARE_WANTRES|VARE_KEEP_DOLLAR, none, none) +Var_Parse: ${VAR:D${8_DOLLARS}} with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Applying ${VAR:D...} to "$$$$$$$$" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, none) +Var_Parse: ${8_DOLLARS}} with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Result of ${VAR:D${8_DOLLARS}} is "$$$$$$$$" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, none) Global:VAR = $$$$$$$$ -Var_Parse: ${VAR:@var@${8_DOLLARS}@} with VARE_WANTRES|VARE_KEEP_DOLLAR -Applying ${VAR:@...} to "$$$$$$$$" (VARE_WANTRES|VARE_KEEP_DOLLAR, none, none) +Var_Parse: ${VAR:@var@${8_DOLLARS}@} with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Applying ${VAR:@...} to "$$$$$$$$" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, none) Modifier part: "var" Modifier part: "${8_DOLLARS}" ModifyWords: split "$$$$$$$$" into 1 words Global:var = $$$$$$$$ -Var_Parse: ${8_DOLLARS} with VARE_WANTRES +Var_Parse: ${8_DOLLARS} with VARE_WANTRES|VARE_KEEP_UNDEF ModifyWord_Loop: in "$$$$$$$$", replace "var" with "${8_DOLLARS}" to "$$$$" Global:delete var -Result of ${VAR:@var@${8_DOLLARS}@} is "$$$$" (VARE_WANTRES|VARE_KEEP_DOLLAR, none, none) +Result of ${VAR:@var@${8_DOLLARS}@} is "$$$$" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, none) Global:VAR = $$$$ Global:.MAKEFLAGS = -r -k -d v -d Global:.MAKEFLAGS = -r -k -d v -d 0 exit status 0 diff --git a/unit-tests/varmod-edge.exp b/unit-tests/varmod-edge.exp index 94ba81e2e4f0..c90eef2756c6 100644 --- a/unit-tests/varmod-edge.exp +++ b/unit-tests/varmod-edge.exp @@ -1,22 +1,23 @@ -make: "varmod-edge.mk" line omitted: ok M-paren -make: "varmod-edge.mk" line omitted: ok M-mixed -make: "varmod-edge.mk" line omitted: ok M-unescape +make: "varmod-edge.mk" line 166: ok M-paren +make: "varmod-edge.mk" line 166: ok M-mixed +make: "varmod-edge.mk" line 166: ok M-unescape make: Unclosed variable specification (expecting '}') for "" (value "*)") modifier U -make: "varmod-edge.mk" line omitted: ok M-nest-mix -make: "varmod-edge.mk" line omitted: ok M-nest-brk -make: "varmod-edge.mk" line omitted: ok M-pat-err -make: "varmod-edge.mk" line omitted: ok M-bsbs -make: "varmod-edge.mk" line omitted: ok M-bs1-par -make: "varmod-edge.mk" line omitted: ok M-bs2-par -make: "varmod-edge.mk" line omitted: ok M-128 -make: "varmod-edge.mk" line omitted: ok eq-ext -make: "varmod-edge.mk" line omitted: ok eq-q -make: "varmod-edge.mk" line omitted: ok eq-bs +make: "varmod-edge.mk" line 166: ok M-nest-mix +make: "varmod-edge.mk" line 166: ok M-nest-brk +make: "varmod-edge.mk" line 166: ok M-pat-err +make: "varmod-edge.mk" line 166: ok M-bsbs +make: "varmod-edge.mk" line 166: ok M-bs1-par +make: "varmod-edge.mk" line 166: ok M-bs2-par +make: "varmod-edge.mk" line 166: ok M-128 +make: "varmod-edge.mk" line 166: ok eq-ext +make: "varmod-edge.mk" line 166: ok eq-q +make: "varmod-edge.mk" line 166: ok eq-bs make: Unfinished modifier for INP.eq-esc ('=' missing) -make: "varmod-edge.mk" line omitted: ok eq-esc -make: "varmod-edge.mk" line omitted: ok colon -make: Unknown modifier ':' -make: Unknown modifier ':' -make: "varmod-edge.mk" line omitted: ok colons -ok -exit status 0 +make: "varmod-edge.mk" line 166: ok eq-esc +make: "varmod-edge.mk" line 166: ok colon +make: "varmod-edge.mk" line 165: Unknown modifier ':' +make: "varmod-edge.mk" line 165: Unknown modifier ':' +make: "varmod-edge.mk" line 166: ok colons +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/varmod-extension.exp b/unit-tests/varmod-extension.exp index 24f7403c7f3f..1ea2b2f0e995 100644 --- a/unit-tests/varmod-extension.exp +++ b/unit-tests/varmod-extension.exp @@ -1,10 +1,11 @@ extension of 'a/b/c' is '' extension of 'def' is '' extension of 'a.b.c' is 'c' extension of 'a.b/c' is 'b/c' extension of 'a' is '' extension of 'a.a' is 'a' extension of '.gitignore' is 'gitignore' extension of 'a' is '' extension of 'a.a' is 'a' +extension of 'trailing/' is '' exit status 0 diff --git a/unit-tests/varmod-extension.mk b/unit-tests/varmod-extension.mk index db501f7234c7..14ebed0debc1 100644 --- a/unit-tests/varmod-extension.mk +++ b/unit-tests/varmod-extension.mk @@ -1,9 +1,9 @@ -# $NetBSD: varmod-extension.mk,v 1.3 2020/08/23 15:09:15 rillig Exp $ +# $NetBSD: varmod-extension.mk,v 1.4 2020/12/20 22:57:40 rillig Exp $ # # Tests for the :E variable modifier, which returns the filename extension # of each word in the variable. all: -.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a +.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a trailing/ @echo "extension of '"${path:Q}"' is '"${path:E:Q}"'" .endfor diff --git a/unit-tests/varmod-gmtime.exp b/unit-tests/varmod-gmtime.exp index 06e6314c7bfb..1baa0215b6e6 100644 --- a/unit-tests/varmod-gmtime.exp +++ b/unit-tests/varmod-gmtime.exp @@ -1,27 +1,13 @@ -mod-gmtime: -%Y -2020 -%Y -localtime == localtime -mod-gmtime-indirect: -make: Invalid time value: ${:U1593536400}} - -mtime=1593536400} -parse-errors: -make: Invalid time value: -1}. - -: -1 becomes mtime=-1}. -make: Invalid time value: 1}. - -: space 1 becomes mtime= 1}. -: 0 becomes ok. -: 1 becomes Thu Jan 1 00:00:01 1970. -: INT32_MAX becomes Tue Jan 19 03:14:07 2038. -: INT32_MAX + 1 becomes Tue Jan 19 03:14:08 2038. -make: Invalid time value: 10000000000000000000000000000000}. - -: overflow becomes mtime=10000000000000000000000000000000}. -make: Invalid time value: error}. - -: letter becomes mtime=error}. -exit status 0 +make: "varmod-gmtime.mk" line 60: Invalid time value: ${:U1593536400}} != "mtime=11593536400}" +make: "varmod-gmtime.mk" line 60: Malformed conditional (${%Y:L:gmtime=${:U1593536400}} != "mtime=11593536400}") +make: "varmod-gmtime.mk" line 70: Invalid time value: -1} != "" +make: "varmod-gmtime.mk" line 70: Malformed conditional (${:L:gmtime=-1} != "") +make: "varmod-gmtime.mk" line 79: Invalid time value: 1} != "" +make: "varmod-gmtime.mk" line 79: Malformed conditional (${:L:gmtime= 1} != "") +make: "varmod-gmtime.mk" line 118: Invalid time value: 10000000000000000000000000000000} != "" +make: "varmod-gmtime.mk" line 118: Malformed conditional (${:L:gmtime=10000000000000000000000000000000} != "") +make: "varmod-gmtime.mk" line 129: Invalid time value: error} != "" +make: "varmod-gmtime.mk" line 129: Malformed conditional (${:L:gmtime=error} != "") +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/varmod-gmtime.mk b/unit-tests/varmod-gmtime.mk index b404d1c2768e..3c5f04991c48 100644 --- a/unit-tests/varmod-gmtime.mk +++ b/unit-tests/varmod-gmtime.mk @@ -1,87 +1,136 @@ -# $NetBSD: varmod-gmtime.mk,v 1.6 2020/10/31 20:30:06 rillig Exp $ +# $NetBSD: varmod-gmtime.mk,v 1.9 2020/12/22 07:22:39 rillig Exp $ # # Tests for the :gmtime variable modifier, which formats a timestamp # using strftime(3) in UTC. -all: mod-gmtime -all: mod-gmtime-indirect -all: parse-errors +.if ${TZ:Uundefined} != "undefined" # see unit-tests/Makefile +. error +.endif # Test for the default time format, %c. Since the time always varies, it's # only possible to check for the general format here. The names of the # month and weekday are always in English, independent from the locale. # Example: Thu Oct 29 18:56:41 2020 .if ${:U:gmtime:tW:M??? ??? ?? ??\:??\:?? ????} == "" . error .endif -mod-gmtime: - @echo $@: - - # modifier name too short - @echo ${%Y:L:gmtim=1593536400} - - # 2020-07-01T00:00:00Z - @echo ${%Y:L:gmtime=1593536400} - - # modifier name too long - @echo ${%Y:L:gmtimer=1593536400} - - # If the modifier name is not matched exactly, fall back to the - # :from=to modifier. - @echo ${gmtime:L:gm%=local%} == localtime - -mod-gmtime-indirect: - @echo $@: - - # As of 2020-08-16, it is not possible to pass the seconds via a - # variable expression. This is because parsing of the :gmtime - # modifier stops at the '$' and returns to ApplyModifiers. - # - # There, a colon would be skipped but not a dollar. - # Parsing therefore continues at the '$' of the ${:U159...}, looking - # for an ordinary variable modifier. - # - # At this point, the ${:U} is expanded and interpreted as a variable - # modifier, which results in the error message "Unknown modifier '1'". - # - # If ApplyModifier_Gmtime were to pass its argument through - # ParseModifierPart, this would work. - @echo ${%Y:L:gmtime=${:U1593536400}} - -parse-errors: - @echo $@: - - # As of 2020-10-31, it is possible to pass negative time stamps - # to the :gmtime modifier, resulting in dates before 1970. - # Going back 50 years in the past is not a practical use case for - # make. - : -1 becomes ${:L:gmtime=-1}. - - # Spaces are allowed, not because it would make sense but just as - # a side-effect from using strtoul. - : space 1 becomes ${:L:gmtime= 1}. - - # 0 means now; to get consistent test results, the actual value has - # to be normalized. - : 0 becomes ${:L:gmtime=0:C,^... ... .. ..:..:.. 20..$,ok,W}. - - : 1 becomes ${:L:gmtime=1}. - - : INT32_MAX becomes ${:L:gmtime=2147483647}. - - # This may be different if time_t is still a 32-bit signed integer. - : INT32_MAX + 1 becomes ${:L:gmtime=2147483648}. - - # Integer overflow. - # Because this modifier is implemented using strtoul, the parsed - # time is ULONG_MAX, which gets converted to -1. This results - # in a time stamp of the second before 1970. - : overflow becomes ${:L:gmtime=10000000000000000000000000000000}. - - # As of 2020-10-31, there is no error handling while parsing the - # :gmtime modifier, thus no error message is printed. Parsing - # stops after the '=', and the remaining string is parsed for - # more variable modifiers. Because of the unknown modifier 'e', - # the whole variable value is discarded and thus not printed. - : letter becomes ${:L:gmtime=error}. + +# modifier name too short, falling back to the SysV modifier. +.if ${%Y:L:gmtim=1593536400} != "%Y" +. error +.endif + + +# 2020-07-01T00:00:00Z +.if ${%Y:L:gmtime=1593536400} != "2020" +. error +.endif + + +# modifier name too long, falling back to the SysV modifier. +.if ${%Y:L:gmtimer=1593536400} != "%Y" +. error +.endif + + +# If the modifier name is not matched exactly, fall back to the +# :from=to modifier. +.if ${gmtime:L:gm%=local%} != "localtime" +. error +.endif + + +# As of 2020-08-16, it is not possible to pass the seconds via a +# variable expression. This is because parsing of the :gmtime +# modifier stops at the '$' and returns to ApplyModifiers. +# +# There, a colon would be skipped but not a dollar. +# Parsing therefore continues at the '$' of the ${:U159...}, looking +# for an ordinary variable modifier. +# +# At this point, the ${:U} is expanded and interpreted as a variable +# modifier, which results in the error message "Unknown modifier '1'". +# +# If ApplyModifier_Gmtime were to pass its argument through +# ParseModifierPart, this would work. +# +# XXX: Where does the empty line 4 in varmod-gmtime.exp come from? +# TODO: Remove the \n from "Invalid time value: %s\n" in var.c. +.if ${%Y:L:gmtime=${:U1593536400}} != "mtime=11593536400}" +. error +.endif + + +# Before var.c 1.631 from 2020-10-31 21:40:20, it was possible to pass +# negative time stamps to the :gmtime modifier, resulting in dates before +# 1970. Going back 50 years in the past is not a practical use case for +# make. Therefore, since var.c 1.631, negative time stamps produce a +# parse error. +.if ${:L:gmtime=-1} != "" +. error +.else +. error +.endif + + +# Spaces were allowed before var.c 1.631, not because it would make sense +# but just as a side-effect from using strtoul. +.if ${:L:gmtime= 1} != "" +. error +.endif + + +# 0 means now; this differs from GNode.mtime, where a 0 means nonexistent. +# Since "now" constantly changes, the strongest possible test is to match the +# resulting pattern. +.if !${:L:gmtime=0:tW:M??? ??? ?? ??\:??\:?? 20??} +. error +.endif + + +.if ${:L:gmtime=1} != "Thu Jan 1 00:00:01 1970" +. error +.endif + + +# INT32_MAX +.if ${:L:gmtime=2147483647} != "Tue Jan 19 03:14:07 2038" +. error +.endif + + +.if ${:L:gmtime=2147483648} == "Tue Jan 19 03:14:08 2038" +# All systems that have unsigned time_t or 64-bit time_t. +.elif ${:L:gmtime=2147483648} != "Fri Dec 13 20:45:52 1901" +# FreeBSD-12.0-i386 still has 32-bit signed time_t. +.else +. error +.endif + + +# Integer overflow, at least before var.c 1.631 from 2020-10-31. +# Because this modifier is implemented using strtoul, the parsed time was +# ULONG_MAX, which got converted to -1. This resulted in a time stamp of +# the second before 1970. +# +# Since var.c 1.631, the overflow is detected and produces a parse error. +.if ${:L:gmtime=10000000000000000000000000000000} != "" +. error +.else +. error +.endif + +# Before var.c 1.631 from 2020-10-31, there was no error handling while +# parsing the :gmtime modifier, thus no error message is printed. Parsing +# stopped after the '=', and the remaining string was parsed for more variable +# modifiers. Because of the unknown modifier 'e' from the 'error', the whole +# variable value was discarded and thus not printed. +.if ${:L:gmtime=error} != "" +. error +.else +. error +.endif + + +all: diff --git a/unit-tests/varmod-head.exp b/unit-tests/varmod-head.exp index f0bf87f03012..651844439f5f 100644 --- a/unit-tests/varmod-head.exp +++ b/unit-tests/varmod-head.exp @@ -1,10 +1,11 @@ head (dirname) of 'a/b/c' is 'a/b' head (dirname) of 'def' is '.' head (dirname) of 'a.b.c' is '.' head (dirname) of 'a.b/c' is 'a.b' head (dirname) of 'a' is '.' head (dirname) of 'a.a' is '.' head (dirname) of '.gitignore' is '.' head (dirname) of 'a' is '.' head (dirname) of 'a.a' is '.' +head (dirname) of 'trailing/' is 'trailing' exit status 0 diff --git a/unit-tests/varmod-head.mk b/unit-tests/varmod-head.mk index eda4820c5f14..66347b4bce61 100644 --- a/unit-tests/varmod-head.mk +++ b/unit-tests/varmod-head.mk @@ -1,9 +1,9 @@ -# $NetBSD: varmod-head.mk,v 1.3 2020/08/23 15:09:15 rillig Exp $ +# $NetBSD: varmod-head.mk,v 1.4 2020/12/20 22:57:40 rillig Exp $ # # Tests for the :H variable modifier, which returns the dirname of # each of the words in the variable value. all: -.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a +.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a trailing/ @echo "head (dirname) of '"${path:Q}"' is '"${path:H:Q}"'" .endfor diff --git a/unit-tests/varmod-ifelse.exp b/unit-tests/varmod-ifelse.exp index 75518c08117f..17d4d8afcbeb 100644 --- a/unit-tests/varmod-ifelse.exp +++ b/unit-tests/varmod-ifelse.exp @@ -1,16 +1,20 @@ make: Bad conditional expression `variable expression == "literal"' in variable expression == "literal"?bad:bad make: "varmod-ifelse.mk" line 27: Malformed conditional (${${:Uvariable expression} == "literal":?bad:bad}) make: Bad conditional expression ` == ""' in == ""?bad-assign:bad-assign make: Bad conditional expression ` == ""' in == ""?bad-cond:bad-cond make: "varmod-ifelse.mk" line 44: Malformed conditional (${${UNDEF} == "":?bad-cond:bad-cond}) make: Bad conditional expression `1 == == 2' in 1 == == 2?yes:no make: "varmod-ifelse.mk" line 66: Malformed conditional (${1 == == 2:?yes:no} != "") CondParser_Eval: "${1 == == 2:?yes:no}" != "" CondParser_Eval: 1 == == 2 lhs = 1.000000, rhs = 0.000000, op = == make: Bad conditional expression `1 == == 2' in 1 == == 2?yes:no lhs = "", rhs = "", op = != make: "varmod-ifelse.mk" line 92: warning: Oops, the parse error should have been propagated. +CondParser_Eval: ${ ${:U\$}{VAR} == value :?ok:bad} != "ok" +CondParser_Eval: ${VAR} == value +lhs = "value", rhs = "value", op = == +lhs = "ok", rhs = "ok", op = != make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/varmod-ifelse.mk b/unit-tests/varmod-ifelse.mk index ea94dc875e4d..5e0ad04584be 100644 --- a/unit-tests/varmod-ifelse.mk +++ b/unit-tests/varmod-ifelse.mk @@ -1,97 +1,115 @@ -# $NetBSD: varmod-ifelse.mk,v 1.6 2020/11/12 00:29:55 rillig Exp $ +# $NetBSD: varmod-ifelse.mk,v 1.8 2020/12/10 16:47:42 rillig Exp $ # # Tests for the ${cond:?then:else} variable modifier, which evaluates either # the then-expression or the else-expression, depending on the condition. # # The modifier was added on 1998-04-01. # # Until 2015-10-11, the modifier always evaluated both the "then" and the # "else" expressions. # TODO: Implementation # The variable name of the expression is expanded and then taken as the # condition. In this case it becomes: # # variable expression == "variable expression" # # This confuses the parser, which expects an operator instead of the bare # word "expression". If the name were expanded lazily, everything would be # fine since the condition would be: # # ${:Uvariable expression} == "literal" # # Evaluating the variable name lazily would require additional code in # Var_Parse and ParseVarname, it would be more useful and predictable # though. .if ${${:Uvariable expression} == "literal":?bad:bad} . error .else . error .endif # In a variable assignment, undefined variables are not an error. # Because of the early expansion, the whole condition evaluates to # ' == ""' though, which cannot be parsed because the left-hand side looks # empty. COND:= ${${UNDEF} == "":?bad-assign:bad-assign} # In a condition, undefined variables generate a "Malformed conditional" # error. That error message is wrong though. In lint mode, the correct # "Undefined variable" error message is generated. # The difference to the ':=' variable assignment is the additional # "Malformed conditional" error message. .if ${${UNDEF} == "":?bad-cond:bad-cond} . error .else . error .endif # When the :? is parsed, it is greedy. The else branch spans all the # text, up until the closing character '}', even if the text looks like # another modifier. .if ${1:?then:else:Q} != "then" . error .endif .if ${0:?then:else:Q} != "else:Q" . error .endif # This line generates 2 error messages. The first comes from evaluating the # malformed conditional "1 == == 2", which is reported as "Bad conditional # expression" by ApplyModifier_IfElse. The variable expression containing that # conditional therefore returns a parse error from Var_Parse, and this parse # error propagates to CondEvalExpression, where the "Malformed conditional" # comes from. .if ${1 == == 2:?yes:no} != "" . error .else . error .endif # If the "Bad conditional expression" appears in a quoted string literal, the # error message "Malformed conditional" is not printed, leaving only the "Bad # conditional expression". # # XXX: The left-hand side is enclosed in quotes. This results in Var_Parse # being called without VARE_UNDEFERR being set. When ApplyModifier_IfElse # returns AMR_CLEANUP as result, Var_Parse returns varUndefined since the # value of the variable expression is still undefined. CondParser_String is # then supposed to do proper error handling, but since varUndefined is local # to var.c, it cannot distinguish this return value from an ordinary empty # string. The left-hand side of the comparison is therefore just an empty # string, which is obviously equal to the empty string on the right-hand side. # # XXX: The debug log for -dc shows a comparison between 1.0 and 0.0. The # condition should be detected as being malformed before any comparison is # done since there is no well-formed comparison in the condition at all. .MAKEFLAGS: -dc .if "${1 == == 2:?yes:no}" != "" . error .else . warning Oops, the parse error should have been propagated. .endif .MAKEFLAGS: -d0 +# As of 2020-12-10, the variable "name" is first expanded, and the result of +# this expansion is then taken as the condition. To force the variable +# expression in the condition to be evaluated at exactly the right point, +# the '$' of the intended '${VAR}' escapes from the parser in form of the +# expression ${:U\$}. Because of this escaping, the variable "name" and thus +# the condition ends up as "${VAR} == value", just as intended. +# +# This hack does not work for variables from .for loops since these are +# expanded at parse time to their corresponding ${:Uvalue} expressions. +# Making the '$' of the '${VAR}' expression indirect hides this expression +# from the parser of the .for loop body. See SubstVarLong. +.MAKEFLAGS: -dc +VAR= value +.if ${ ${:U\$}{VAR} == value :?ok:bad} != "ok" +. error +.endif +.MAKEFLAGS: -d0 + all: @:; diff --git a/unit-tests/varmod-indirect.exp b/unit-tests/varmod-indirect.exp new file mode 100644 index 000000000000..8cdd49ad4f03 --- /dev/null +++ b/unit-tests/varmod-indirect.exp @@ -0,0 +1,59 @@ +make: "varmod-indirect.mk" line 13: Unknown modifier '$' +make: "varmod-indirect.mk" line 108: before +make: "varmod-indirect.mk" line 108: after +make: "varmod-indirect.mk" line 114: before +make: "varmod-indirect.mk" line 114: after +make: "varmod-indirect.mk" line 120: before +make: "varmod-indirect.mk" line 120: after +make: "varmod-indirect.mk" line 124: Unknown modifier 'Z' +make: "varmod-indirect.mk" line 125: before +make: "varmod-indirect.mk" line 125: after +ParseReadLine (134): '_:= before ${UNDEF} after' +Global:_ = +Var_Parse: ${UNDEF} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Global:_ = before ${UNDEF} after +ParseReadLine (137): '_:= before ${UNDEF:${:US,a,a,}} after' +Var_Parse: ${UNDEF:${:US,a,a,}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Var_Parse: ${:US,a,a,}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Applying ${:U...} to "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Result of ${:US,a,a,} is "S,a,a," (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF|VEF_DEF) +Indirect modifier "S,a,a," from "${:US,a,a,}" +Applying ${UNDEF:S...} to "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Modifier part: "a" +Modifier part: "a" +ModifyWords: split "" into 1 words +Result of ${UNDEF:S,a,a,} is "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Var_Parse: ${:US,a,a,}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Applying ${:U...} to "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Result of ${:US,a,a,} is "S,a,a," (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF|VEF_DEF) +Global:_ = before ${UNDEF:S,a,a,} after +ParseReadLine (147): '_:= before ${UNDEF:${:U}} after' +Var_Parse: ${UNDEF:${:U}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Var_Parse: ${:U}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Applying ${:U} to "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Result of ${:U} is "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF|VEF_DEF) +Indirect modifier "" from "${:U}" +Var_Parse: ${:U}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Applying ${:U} to "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Result of ${:U} is "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF|VEF_DEF) +Global:_ = before ${UNDEF:} after +ParseReadLine (152): '_:= before ${UNDEF:${:UZ}} after' +Var_Parse: ${UNDEF:${:UZ}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Var_Parse: ${:UZ}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Applying ${:U...} to "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Result of ${:UZ} is "Z" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF|VEF_DEF) +Indirect modifier "Z" from "${:UZ}" +Applying ${UNDEF:Z} to "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +make: "varmod-indirect.mk" line 152: Unknown modifier 'Z' +Result of ${UNDEF:Z} is error (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Var_Parse: ${:UZ}} after with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF +Applying ${:U...} to "" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF) +Result of ${:UZ} is "Z" (VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF, none, VEF_UNDEF|VEF_DEF) +Global:_ = before ${UNDEF:Z} after +ParseReadLine (154): '.MAKEFLAGS: -d0' +ParseDoDependency(.MAKEFLAGS: -d0) +Global:.MAKEFLAGS = -r -k -d 0 -d pv -d +Global:.MAKEFLAGS = -r -k -d 0 -d pv -d 0 +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/varmod-indirect.mk b/unit-tests/varmod-indirect.mk new file mode 100644 index 000000000000..d130c7cae76d --- /dev/null +++ b/unit-tests/varmod-indirect.mk @@ -0,0 +1,157 @@ +# $NetBSD: varmod-indirect.mk,v 1.5 2020/12/27 17:32:25 rillig Exp $ +# +# Tests for indirect variable modifiers, such as in ${VAR:${M_modifiers}}. +# These can be used for very basic purposes like converting a string to either +# uppercase or lowercase, as well as for fairly advanced modifiers that first +# look like line noise and are hard to decipher. +# +# TODO: Since when are indirect modifiers supported? + + +# To apply a modifier indirectly via another variable, the whole +# modifier must be put into a single variable expression. +.if ${value:L:${:US}${:U,value,replacement,}} != "S,value,replacement,}" +. warning unexpected +.endif + + +# Adding another level of indirection (the 2 nested :U expressions) helps. +.if ${value:L:${:U${:US}${:U,value,replacement,}}} != "replacement" +. warning unexpected +.endif + + +# Multiple indirect modifiers can be applied one after another as long as +# they are separated with colons. +.if ${value:L:${:US,a,A,}:${:US,e,E,}} != "vAluE" +. warning unexpected +.endif + + +# An indirect variable that evaluates to the empty string is allowed though. +# This makes it possible to define conditional modifiers, like this: +# +# M.little-endian= S,1234,4321, +# M.big-endian= # none +.if ${value:L:${:Dempty}S,a,A,} != "vAlue" +. warning unexpected +.endif + + +# The nested variable expression expands to "tu", and this is interpreted as +# a variable modifier for the value "Upper", resulting in "UPPER". +.if ${Upper:L:${:Utu}} != "UPPER" +. error +.endif + +# The nested variable expression expands to "tl", and this is interpreted as +# a variable modifier for the value "Lower", resulting in "lower". +.if ${Lower:L:${:Utl}} != "lower" +. error +.endif + + +# The nested variable expression is ${1 != 1:?Z:tl}, consisting of the +# condition "1 != 1", the then-branch "Z" and the else-branch "tl". Since +# the condition evaluates to false, the then-branch is ignored (it would +# have been an unknown modifier anyway) and the ":tl" modifier is applied. +.if ${Mixed:L:${1 != 1:?Z:tl}} != "mixed" +. error +.endif + + +# The indirect modifier can also replace an ':L' modifier, which allows for +# brain twisters since by reading the expression alone, it is not possible +# to say whether the variable name will be evaluated as a variable name or +# as the immediate value of the expression. +VAR= value +M_ExpandVar= # an empty modifier +M_VarAsValue= L +# +.if ${VAR:${M_ExpandVar}} != "value" +. error +.endif +.if ${VAR:${M_VarAsValue}} != "VAR" +. error +.endif + +# The indirect modifier M_ListToSkip, when applied to a list of patterns, +# expands to a sequence of ':N' modifiers, each of which filters one of the +# patterns. This list of patterns can then be applied to another variable +# to actually filter that variable. +# +M_ListToSkip= @pat@N$${pat}@:ts: +# +# The dollar signs need to be doubled in the above modifier expression, +# otherwise they would be expanded too early, that is, when parsing the +# modifier itself. +# +# In the following example, M_NoPrimes expands to 'N2:N3:N5:N7:N1[1379]'. +# The 'N' comes from the expression 'N${pat}', the separating colons come +# from the modifier ':ts:'. +# +#.MAKEFLAGS: -dcv # Uncomment this line to see the details +# +PRIMES= 2 3 5 7 1[1379] +M_NoPrimes= ${PRIMES:${M_ListToSkip}} +.if ${:U:range=20:${M_NoPrimes}} != "1 4 6 8 9 10 12 14 15 16 18 20" +. error +.endif +.MAKEFLAGS: -d0 + + +# In contrast to the .if conditions, the .for loop allows undefined variable +# expressions. These expressions expand to empty strings. + +# An undefined expression without any modifiers expands to an empty string. +.for var in before ${UNDEF} after +. info ${var} +.endfor + +# An undefined expression with only modifiers that keep the expression +# undefined expands to an empty string. +.for var in before ${UNDEF:${:US,a,a,}} after +. info ${var} +.endfor + +# Even in an indirect modifier based on an undefined variable, the value of +# the expression in Var_Parse is a simple empty string. +.for var in before ${UNDEF:${:U}} after +. info ${var} +.endfor + +# An error in an indirect modifier. +.for var in before ${UNDEF:${:UZ}} after +. info ${var} +.endfor + + +# Another slightly different evaluation context is the right-hand side of +# a variable assignment using ':='. +.MAKEFLAGS: -dpv + +# The undefined variable expression is kept as-is. +_:= before ${UNDEF} after + +# The undefined variable expression is kept as-is. +_:= before ${UNDEF:${:US,a,a,}} after + +# XXX: The subexpression ${:U} is fully defined, therefore it is expanded. +# This results in ${UNDEF:}, which can lead to tricky parse errors later, +# when the variable '_' is expanded further. +# +# XXX: What should be the correct strategy here? One possibility is to +# expand the defined subexpression and replace it with ${:U...}, just like +# in .for loops. This would preserve the structure of the expression while +# at the same time expanding the expression as far as possible. +_:= before ${UNDEF:${:U}} after + +# XXX: This expands to ${UNDEF:Z}, which will behave differently if the +# variable '_' is used in a context where the variable expression ${_} is +# parsed but not evaluated. +_:= before ${UNDEF:${:UZ}} after + +.MAKEFLAGS: -d0 +.undef _ + +all: diff --git a/unit-tests/varmod-localtime.exp b/unit-tests/varmod-localtime.exp index e89a03b40765..b58de7700466 100644 --- a/unit-tests/varmod-localtime.exp +++ b/unit-tests/varmod-localtime.exp @@ -1,27 +1,13 @@ -mod-localtime -%Y -2020 -%Y -gmtime == gmtime -mod-localtime-indirect: -make: Invalid time value: ${:U1593536400}} - -ocaltime=1593536400} -parse-errors: -make: Invalid time value: -1}. - -: -1 becomes ocaltime=-1}. -make: Invalid time value: 1}. - -: space 1 becomes ocaltime= 1}. -: 0 becomes ok. -: 1 becomes Thu Jan 1 01:00:01 1970. -: INT32_MAX becomes Tue Jan 19 04:14:07 2038. -: INT32_MAX + 1 becomes Tue Jan 19 04:14:08 2038. -make: Invalid time value: 10000000000000000000000000000000}. - -: overflow becomes ocaltime=10000000000000000000000000000000}. -make: Invalid time value: error}. - -: letter becomes ocaltime=error}. -exit status 0 +make: "varmod-localtime.mk" line 60: Invalid time value: ${:U1593536400}} != "mtime=11593536400}" +make: "varmod-localtime.mk" line 60: Malformed conditional (${%Y:L:localtime=${:U1593536400}} != "mtime=11593536400}") +make: "varmod-localtime.mk" line 70: Invalid time value: -1} != "" +make: "varmod-localtime.mk" line 70: Malformed conditional (${:L:localtime=-1} != "") +make: "varmod-localtime.mk" line 79: Invalid time value: 1} != "" +make: "varmod-localtime.mk" line 79: Malformed conditional (${:L:localtime= 1} != "") +make: "varmod-localtime.mk" line 118: Invalid time value: 10000000000000000000000000000000} != "" +make: "varmod-localtime.mk" line 118: Malformed conditional (${:L:localtime=10000000000000000000000000000000} != "") +make: "varmod-localtime.mk" line 129: Invalid time value: error} != "" +make: "varmod-localtime.mk" line 129: Malformed conditional (${:L:localtime=error} != "") +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/varmod-localtime.mk b/unit-tests/varmod-localtime.mk index f7358e309046..3ee2f0ac93fb 100644 --- a/unit-tests/varmod-localtime.mk +++ b/unit-tests/varmod-localtime.mk @@ -1,92 +1,136 @@ -# $NetBSD: varmod-localtime.mk,v 1.5 2020/10/31 20:30:06 rillig Exp $ +# $NetBSD: varmod-localtime.mk,v 1.7 2020/12/22 07:22:39 rillig Exp $ # # Tests for the :localtime variable modifier, which formats a timestamp # using strftime(3) in local time. .if ${TZ} != "Europe/Berlin" # see unit-tests/Makefile . error .endif -all: mod-localtime -all: mod-localtime-indirect -all: parse-errors - # Test for the default time format, %c. Since the time always varies, it's # only possible to check for the general format here. The names of the # month and weekday are always in English, independent from the locale. # Example: Thu Oct 29 18:56:41 2020 .if ${:U:localtime:tW:M??? ??? ?? ??\:??\:?? ????} == "" . error .endif -mod-localtime: - @echo $@ - - # modifier name too short - @echo ${%Y:L:localtim=1593536400} - - # 2020-07-01T00:00:00Z - @echo ${%Y:L:localtime=1593536400} - - # modifier name too long - @echo ${%Y:L:localtimer=1593536400} - - # If the modifier name is not matched exactly, fall back to the - # :from=to modifier. - @echo ${localtime:L:local%=gm%} == gmtime - -mod-localtime-indirect: - @echo $@: - - # As of 2020-08-16, it is not possible to pass the seconds via a - # variable expression. This is because parsing of the :localtime - # modifier stops at the '$' and returns to ApplyModifiers. - # - # There, a colon would be skipped but not a dollar. - # Parsing therefore continues at the '$' of the ${:U159...}, looking - # for an ordinary variable modifier. - # - # At this point, the ${:U} is expanded and interpreted as a variable - # modifier, which results in the error message "Unknown modifier '1'". - # - # If ApplyModifier_Localtime were to pass its argument through - # ParseModifierPart, this would work. - @echo ${%Y:L:localtime=${:U1593536400}} - -parse-errors: - @echo $@: - - # As of 2020-10-31, it is possible to pass negative time stamps - # to the :localtime modifier, resulting in dates before 1970. - # Going back 50 years in the past is not a practical use case for - # make. - : -1 becomes ${:L:localtime=-1}. - - # Spaces are allowed, not because it would make sense but just as - # a side-effect from using strtoul. - : space 1 becomes ${:L:localtime= 1}. - - # 0 means now; to get consistent test results, the actual value has - # to be normalized. - : 0 becomes ${:L:localtime=0:C,^... ... .. ..:..:.. 20..$,ok,W}. - - : 1 becomes ${:L:localtime=1}. - - : INT32_MAX becomes ${:L:localtime=2147483647}. - - # This may be different if time_t is still a 32-bit signed integer. - : INT32_MAX + 1 becomes ${:L:localtime=2147483648}. - - # Integer overflow. - # Because this modifier is implemented using strtoul, the parsed - # time is ULONG_MAX, which gets converted to -1. This results - # in a time stamp of the second before 1970 (in UTC) or 3599 seconds - # after New Year's Day in Europe/Berlin. - : overflow becomes ${:L:localtime=10000000000000000000000000000000}. - - # As of 2020-10-31, there is no error handling while parsing the - # :localtime modifier, thus no error message is printed. Parsing - # stops after the '=', and the remaining string is parsed for - # more variable modifiers. Because of the unknown modifier 'e', - # the whole variable value is discarded and thus not printed. - : letter becomes ${:L:localtime=error}. + +# modifier name too short, falling back to the SysV modifier. +.if ${%Y:L:localtim=1593536400} != "%Y" +. error +.endif + + +# 2020-07-01T00:00:00Z +.if ${%Y:L:localtime=1593536400} != "2020" +. error +.endif + + +# modifier name too long, falling back to the SysV modifier. +.if ${%Y:L:localtimer=1593536400} != "%Y" +. error +.endif + + +# If the modifier name is not matched exactly, fall back to the +# :from=to modifier. +.if ${gmtime:L:gm%=local%} != "localtime" +. error +.endif + + +# As of 2020-08-16, it is not possible to pass the seconds via a +# variable expression. This is because parsing of the :localtime +# modifier stops at the '$' and returns to ApplyModifiers. +# +# There, a colon would be skipped but not a dollar. +# Parsing therefore continues at the '$' of the ${:U159...}, looking +# for an ordinary variable modifier. +# +# At this point, the ${:U} is expanded and interpreted as a variable +# modifier, which results in the error message "Unknown modifier '1'". +# +# If ApplyModifier_Localtime were to pass its argument through +# ParseModifierPart, this would work. +# +# XXX: Where does the empty line 4 in varmod-localtime.exp come from? +# TODO: Remove the \n from "Invalid time value: %s\n" in var.c. +.if ${%Y:L:localtime=${:U1593536400}} != "mtime=11593536400}" +. error +.endif + + +# Before var.c 1.631 from 2020-10-31 21:40:20, it was possible to pass +# negative time stamps to the :localtime modifier, resulting in dates before +# 1970. Going back 50 years in the past is not a practical use case for +# make. Therefore, since var.c 1.631, negative time stamps produce a +# parse error. +.if ${:L:localtime=-1} != "" +. error +.else +. error +.endif + + +# Spaces were allowed before var.c 1.631, not because it would make sense +# but just as a side-effect from using strtoul. +.if ${:L:localtime= 1} != "" +. error +.endif + + +# 0 means now; this differs from GNode.mtime, where a 0 means nonexistent. +# Since "now" constantly changes, the strongest possible test is to match the +# resulting pattern. +.if !${:L:localtime=0:tW:M??? ??? ?? ??\:??\:?? 20??} +. error +.endif + + +.if ${:L:localtime=1} != "Thu Jan 1 01:00:01 1970" +. error +.endif + + +# INT32_MAX +.if ${:L:localtime=2147483647} != "Tue Jan 19 04:14:07 2038" +. error +.endif + + +.if ${:L:localtime=2147483648} == "Tue Jan 19 04:14:08 2038" +# All systems that have unsigned time_t or 64-bit time_t. +.elif ${:L:localtime=2147483648} != "Fri Dec 13 21:45:52 1901" +# FreeBSD-12.0-i386 still has 32-bit signed time_t. +.else +. error +.endif + + +# Integer overflow, at least before var.c 1.631 from 2020-10-31. +# Because this modifier is implemented using strtoul, the parsed time was +# ULONG_MAX, which got converted to -1. This resulted in a time stamp of +# the second before 1970. +# +# Since var.c 1.631, the overflow is detected and produces a parse error. +.if ${:L:localtime=10000000000000000000000000000000} != "" +. error +.else +. error +.endif + +# Before var.c 1.631 from 2020-10-31, there was no error handling while +# parsing the :localtime modifier, thus no error message is printed. Parsing +# stopped after the '=', and the remaining string was parsed for more variable +# modifiers. Because of the unknown modifier 'e' from the 'error', the whole +# variable value was discarded and thus not printed. +.if ${:L:localtime=error} != "" +. error +.else +. error +.endif + + +all: diff --git a/unit-tests/varmod-range.exp b/unit-tests/varmod-range.exp index eeeceb72b83f..3a9d4d032c3a 100644 --- a/unit-tests/varmod-range.exp +++ b/unit-tests/varmod-range.exp @@ -1,14 +1,13 @@ make: "varmod-range.mk" line 53: Invalid number: x}Rest" != "Rest" - make: "varmod-range.mk" line 53: Malformed conditional ("${:U:range=x}Rest" != "Rest") -make: Unknown modifier 'x' +make: "varmod-range.mk" line 62: Unknown modifier 'x' make: "varmod-range.mk" line 62: Malformed conditional ("${:U:range=0x0}Rest" != "Rest") -make: Unknown modifier 'r' +make: "varmod-range.mk" line 78: Unknown modifier 'r' make: "varmod-range.mk" line 78: Malformed conditional ("${a b c:L:rang}Rest" != "Rest") -make: Unknown modifier 'r' +make: "varmod-range.mk" line 85: Unknown modifier 'r' make: "varmod-range.mk" line 85: Malformed conditional ("${a b c:L:rango}Rest" != "Rest") -make: Unknown modifier 'r' +make: "varmod-range.mk" line 92: Unknown modifier 'r' make: "varmod-range.mk" line 92: Malformed conditional ("${a b c:L:ranger}Rest" != "Rest") make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/varmod-root.exp b/unit-tests/varmod-root.exp index 24ecbb875f77..2c99cd3ef4c7 100644 --- a/unit-tests/varmod-root.exp +++ b/unit-tests/varmod-root.exp @@ -1,10 +1,11 @@ root of 'a/b/c' is 'a/b/c' root of 'def' is 'def' root of 'a.b.c' is 'a.b' root of 'a.b/c' is 'a' root of 'a' is 'a' root of 'a.a' is 'a' root of '.gitignore' is '' root of 'a' is 'a' root of 'a.a' is 'a' +root of 'trailing/' is 'trailing/' exit status 0 diff --git a/unit-tests/varmod-root.mk b/unit-tests/varmod-root.mk index 88af42d82510..1e3159733df0 100644 --- a/unit-tests/varmod-root.mk +++ b/unit-tests/varmod-root.mk @@ -1,9 +1,9 @@ -# $NetBSD: varmod-root.mk,v 1.3 2020/08/23 15:09:15 rillig Exp $ +# $NetBSD: varmod-root.mk,v 1.4 2020/12/20 22:57:40 rillig Exp $ # # Tests for the :R variable modifier, which returns the filename root # without the extension. all: -.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a +.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a trailing/ @echo "root of '"${path:Q}"' is '"${path:R:Q}"'" .endfor diff --git a/unit-tests/varmod-subst-regex.exp b/unit-tests/varmod-subst-regex.exp index eb9ae7f41fb9..207a97fc25e8 100644 --- a/unit-tests/varmod-subst-regex.exp +++ b/unit-tests/varmod-subst-regex.exp @@ -1,23 +1,25 @@ make: Regex compilation error: (details omitted) mod-regex-compile-error: C,word,____,:Q}. make: No subexpression \1 make: No subexpression \1 make: No subexpression \1 make: No subexpression \1 mod-regex-limits:11-missing:1 6 mod-regex-limits:11-ok:1 22 446 make: No subexpression \2 make: No subexpression \2 make: No subexpression \2 make: No subexpression \2 mod-regex-limits:22-missing:1 6 make: No subexpression \2 make: No subexpression \2 make: No subexpression \2 make: No subexpression \2 mod-regex-limits:22-missing:1 6 mod-regex-limits:22-ok:1 33 556 mod-regex-limits:capture:ihgfedcbaabcdefghijABCDEFGHIJa0a1a2rest make: Regex compilation error: (details omitted) mod-regex-errors: +make: Unknown modifier 'Z' +mod-regex-errors: xy exit status 0 diff --git a/unit-tests/varmod-subst-regex.mk b/unit-tests/varmod-subst-regex.mk index f558ae1134e8..91b2f0e6a2f9 100644 --- a/unit-tests/varmod-subst-regex.mk +++ b/unit-tests/varmod-subst-regex.mk @@ -1,104 +1,109 @@ -# $NetBSD: varmod-subst-regex.mk,v 1.5 2020/10/31 12:20:36 rillig Exp $ +# $NetBSD: varmod-subst-regex.mk,v 1.6 2020/12/05 18:13:44 rillig Exp $ # # Tests for the :C,from,to, variable modifier. all: mod-regex-compile-error all: mod-regex-limits all: mod-regex-errors # The variable expression expands to 4 words. Of these words, none matches # the regular expression "a b" since these words don't contain any # whitespace. .if ${:Ua b b c:C,a b,,} != "a b b c" . error .endif # Using the '1' modifier does not change anything. The '1' modifier just # means to apply at most 1 replacement in the whole variable expression. .if ${:Ua b b c:C,a b,,1} != "a b b c" . error .endif # The 'W' modifier treats the whole variable value as a single big word, # containing whitespace. This big word matches the regular expression, # therefore it gets replaced. Whitespace is preserved after replacing. .if ${:Ua b b c:C,a b,,W} != " b c" . error .endif # The 'g' modifier does not have any effect here since each of the words # contains the character 'b' a single time. .if ${:Ua b b c:C,b,,g} != "a c" . error .endif # The first :C modifier has the 'W' modifier, which makes the whole # expression a single word. The 'g' modifier then replaces all occurrences # of "1 2" with "___". The 'W' modifier only applies to this single :C # modifier. This is demonstrated by the :C modifier that follows. If the # 'W' modifier would be preserved, only a single underscore would have been # replaced with an 'x'. .if ${:U1 2 3 1 2 3:C,1 2,___,Wg:C,_,x,} != "x__ 3 x__ 3" . error .endif # The regular expression does not match in the first word. # It matches once in the second word, and the \0\0 doubles that word. # In the third word, the regular expression matches as early as possible, # and since the matches must not overlap, the next possible match would # start at the 6, but at that point, there is only one character left, # and that cannot match the regular expression "..". Therefore only the # "45" is doubled in the third word. .if ${:U1 23 456:C,..,\0\0,} != "1 2323 45456" . error .endif # The modifier '1' applies the replacement at most once, across the whole # expression value, no matter whether it is a single big word or many small # words. # # Up to 2020-08-28, the manual page said that the modifiers '1' and 'g' # were orthogonal, which was wrong. It doesn't make sense to specify both # 'g' and '1' at the same time. .if ${:U12345 12345:C,.,\0\0,1} != "112345 12345" . error .endif # A regular expression that matches the empty string applies before every # single character of the word. # XXX: Most other places where regular expression are used match at the end # of the string as well. .if ${:U1a2b3c:C,a*,*,g} != "*1**2*b*3*c" . error .endif # A dot in the regular expression matches any character, even a newline. # In most other contexts where regular expressions are used, a dot matches # any character except newline. In make, regcomp is called without # REG_NEWLINE, thus newline is an ordinary character. .if ${:U"${.newline}":C,.,.,g} != "..." . error .endif # Multiple asterisks form an invalid regular expression. This produces an # error message and (as of 2020-08-28) stops parsing in the middle of the # variable expression. The unparsed part of the expression is then copied # verbatim to the output, which is unexpected and can lead to strange shell # commands being run. mod-regex-compile-error: @echo $@: ${:Uword1 word2:C,****,____,g:C,word,____,:Q}. # These tests generate error messages but as of 2020-08-28 just continue # parsing and execution as if nothing bad had happened. mod-regex-limits: @echo $@:11-missing:${:U1 23 456:C,..,\1\1,:Q} @echo $@:11-ok:${:U1 23 456:C,(.).,\1\1,:Q} @echo $@:22-missing:${:U1 23 456:C,..,\2\2,:Q} @echo $@:22-missing:${:U1 23 456:C,(.).,\2\2,:Q} @echo $@:22-ok:${:U1 23 456:C,(.)(.),\2\2,:Q} # The :C modifier only handles single-digit capturing groups, # which is more than enough for daily use. @echo $@:capture:${:UabcdefghijABCDEFGHIJrest:C,(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.),\9\8\7\6\5\4\3\2\1\0\10\11\12,} mod-regex-errors: @echo $@: ${UNDEF:Uvalue:C,[,,} + + # If the replacement pattern produces a parse error because of an + # unknown modifier, the parse error is ignored in ParseModifierPart + # and the faulty variable expression expands to "". + @echo $@: ${word:L:C,.*,x${:U:Z}y,W} diff --git a/unit-tests/varmod-sysv.exp b/unit-tests/varmod-sysv.exp index 301519ecc747..57e69a667281 100644 --- a/unit-tests/varmod-sysv.exp +++ b/unit-tests/varmod-sysv.exp @@ -1,5 +1,5 @@ -make: Unfinished modifier for word203 ('=' missing) -make: "varmod-sysv.mk" line 210: Malformed conditional (${word203:L:from${:D=}to}) +make: Unfinished modifier for word214 ('=' missing) +make: "varmod-sysv.mk" line 214: Malformed conditional (${word214:L:from${:D=}to}) make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/varmod-sysv.mk b/unit-tests/varmod-sysv.mk index 10643495fef5..751736ceaf74 100644 --- a/unit-tests/varmod-sysv.mk +++ b/unit-tests/varmod-sysv.mk @@ -1,237 +1,241 @@ -# $NetBSD: varmod-sysv.mk,v 1.11 2020/11/01 22:28:52 rillig Exp $ +# $NetBSD: varmod-sysv.mk,v 1.12 2020/12/05 13:01:33 rillig Exp $ # # Tests for the ${VAR:from=to} variable modifier, which replaces the suffix # "from" with "to". It can also use '%' as a wildcard. # # This modifier is applied when the other modifiers don't match exactly. # # See ApplyModifier_SysV. # A typical use case for the :from=to modifier is conversion of filename # extensions. .if ${src.c:L:.c=.o} != "src.o" . error .endif # The modifier applies to each word on its own. .if ${one.c two.c three.c:L:.c=.o} != "one.o two.o three.o" . error .endif # Words that don't match the pattern are passed unmodified. .if ${src.c src.h:L:.c=.o} != "src.o src.h" . error .endif # The :from=to modifier is therefore often combined with the :M modifier. .if ${src.c src.h:L:M*.c:.c=.o} != "src.o" . error .endif # Another use case for the :from=to modifier is to append a suffix to each # word. In this case, the "from" string is empty, therefore it always # matches. The same effect can be achieved with the :S,$,teen, modifier. .if ${four six seven nine:L:=teen} != "fourteen sixteen seventeen nineteen" . error .endif # The :from=to modifier can also be used to surround each word by strings. # It might be tempting to use this for enclosing a string in quotes for the # shell, but that's the job of the :Q modifier. .if ${one two three:L:%=(%)} != "(one) (two) (three)" . error .endif # When the :from=to modifier is parsed, it lasts until the closing brace # or parenthesis. The :Q in the below expression may look like a modifier # but isn't. It is part of the replacement string. .if ${a b c d e:L:%a=x:Q} != "x:Q b c d e" . error .endif # In the :from=to modifier, both parts can contain variable expressions. .if ${one two:L:${:Uone}=${:U1}} != "1 two" . error .endif # In the :from=to modifier, the "from" part is expanded exactly once. .if ${:U\$ \$\$ \$\$\$\$:${:U\$\$\$\$}=4} != "\$ \$\$ 4" . error .endif # In the :from=to modifier, the "to" part is expanded exactly twice. # XXX: The right-hand side should be expanded only once. # XXX: It's hard to get the escaping correct here, and to read that. # XXX: It's not intuitive why the closing brace must be escaped but not # the opening brace. .if ${:U1 2 4:4=${:Uonce\${\:Utwice\}}} != "1 2 oncetwice" . error .endif # The replacement string can contain spaces, thereby changing the number # of words in the variable expression. .if ${In:L:%=% ${:Uthe Sun}} != "In the Sun" . error .endif # If the variable value is empty, it is debatable whether it consists of a # single empty word, or no word at all. The :from=to modifier treats it as # no word at all. +# +# See SysVMatch, which doesn't handle w_len == p_len specially. .if ${:L:=suffix} != "" . error .endif # If the variable value is empty, it is debatable whether it consists of a -# single empty word, or no word at all. The :from=to modifier treats it as -# no word at all. +# single empty word (before 2020-05-06), or no word at all (since 2020-05-06). +# +# See SysVMatch, percent != NULL && w[0] == '\0'. .if ${:L:%=suffix} != "" . error .endif # Before 2020-07-19, an ampersand could be used in the replacement part # of a SysV substitution modifier, and it was replaced with the whole match, # just like in the :S modifier. # # This was probably a copy-and-paste mistake since the code for the SysV # modifier looked a lot like the code for the :S and :C modifiers. # The ampersand is not mentioned in the manual page. .if ${a.bcd.e:L:a.%=%} != "bcd.e" . error .endif # Before 2020-07-19, the result of the expression was "a.bcd.e". .if ${a.bcd.e:L:a.%=&} != "&" . error .endif # Before 2020-07-20, when a SysV modifier was parsed, a single dollar # before the '=' was parsed (but not interpreted) as an anchor. # Parsing something without then evaluating it accordingly doesn't make # sense. .if ${value:L:e$=x} != "value" . error .endif # Before 2020-07-20, the modifier ":e$=x" was parsed as having a left-hand # side "e" and a right-hand side "x". The dollar was parsed (but not # interpreted) as 'anchor at the end'. Therefore the modifier was equivalent # to ":e=x", which doesn't match the string "value$". Therefore the whole # expression evaluated to "value$". .if ${${:Uvalue\$}:L:e$=x} != "valux" . error .endif .if ${value:L:e=x} != "valux" . error .endif # Words that don't match are copied unmodified. .if ${:Ufile.c file.h:%.c=%.cpp} != "file.cpp file.h" . error .endif # The % placeholder can be anywhere in the string, it doesn't have to be at # the beginning of the pattern. .if ${:Ufile.c other.c:file.%=renamed.%} != "renamed.c other.c" . error .endif # It's also possible to modify each word by replacing the prefix and adding # a suffix. .if ${one two:L:o%=a%w} != "anew two" . error .endif # Each word gets the suffix "X" appended. .if ${one two:L:=X} != "oneX twoX" . error .endif # The suffix "o" is replaced with "X". .if ${one two:L:o=X} != "one twX" . error .endif # The suffix "o" is replaced with nothing. .if ${one two:L:o=} != "one tw" . error .endif # The suffix "o" is replaced with a literal percent. The percent is only # a wildcard when it appears on the left-hand side. .if ${one two:L:o=%} != "one tw%" . error .endif # Each word with the suffix "o" is replaced with "X". The percent is a # wildcard even though the right-hand side does not contain another percent. .if ${one two:L:%o=X} != "one X" . error .endif # Each word with the prefix "o" is replaced with "X". The percent is a # wildcard even though the right-hand side does not contain another percent. .if ${one two:L:o%=X} != "X two" . error .endif # For each word with the prefix "o" and the suffix "e", the whole word is # replaced with "X". .if ${one two oe oxen:L:o%e=X} != "X two X oxen" . error .endif # Only the first '%' is the wildcard. .if ${one two o%e other%e:L:o%%e=X} != "one two X X" . error .endif # In the replacement, only the first '%' is the placeholder, all others # are literal percent characters. .if ${one two:L:%=%%} != "one% two%" . error .endif # In the word "one", only a prefix of the pattern suffix "nes" matches, # the whole word is too short. Therefore it doesn't match. .if ${one two:L:%nes=%xxx} != "one two" . error .endif # The :from=to modifier can be used to replace both the prefix and a suffix # of a word with other strings. This is not possible with a single :S # modifier, and using a :C modifier for the same task looks more complicated # in many cases. .if ${prefix-middle-suffix:L:prefix-%-suffix=p-%-s} != "p-middle-s" . error .endif # This is not a SysV modifier since the nested variable expression expands # to an empty string. The '=' in it should be irrelevant during parsing. -# As of 2020-11-01, this seemingly correct modifier leads to a parse error. -# XXX -.if ${word203:L:from${:D=}to} +# XXX: As of 2020-12-05, this expression generates an "Unfinished modifier" +# error, while the correct error message would be "Unknown modifier" since +# there is no modifier named "fromto". +.if ${word214:L:from${:D=}to} . error .endif # XXX: This specially constructed case demonstrates that the SysV modifier # lasts longer than expected. The whole expression initially has the value # "fromto}...". The next modifier is a SysV modifier. ApplyModifier_SysV # parses the modifier as "from${:D=}to", ending at the '}'. Next, the two # parts of the modifier are parsed using ParseModifierPart, which scans # differently, properly handling nested variable expressions. The two parts # are now "fromto}..." and "replaced". .if "${:Ufromto\}...:from${:D=}to}...=replaced}" != "replaced" . error .endif # As of 2020-10-06, the right-hand side of the SysV modifier is expanded # twice. The first expansion happens in ApplyModifier_SysV, where the # modifier is split into its two parts. The second expansion happens # when each word is replaced in ModifyWord_SYSVSubst. # XXX: This is unexpected. Add more test case to demonstrate the effects # of removing one of the expansions. VALUE= value INDIRECT= 1:${VALUE} 2:$${VALUE} 4:$$$${VALUE} .if ${x:L:x=${INDIRECT}} != "1:value 2:value 4:\${VALUE}" . error .endif all: diff --git a/unit-tests/varmod-tail.exp b/unit-tests/varmod-tail.exp index e25c1cc4b914..26c87f3b5c1b 100644 --- a/unit-tests/varmod-tail.exp +++ b/unit-tests/varmod-tail.exp @@ -1,10 +1,11 @@ tail (basename) of 'a/b/c' is 'c' tail (basename) of 'def' is 'def' tail (basename) of 'a.b.c' is 'a.b.c' tail (basename) of 'a.b/c' is 'c' tail (basename) of 'a' is 'a' tail (basename) of 'a.a' is 'a.a' tail (basename) of '.gitignore' is '.gitignore' tail (basename) of 'a' is 'a' tail (basename) of 'a.a' is 'a.a' +tail (basename) of 'trailing/' is '' exit status 0 diff --git a/unit-tests/varmod-tail.mk b/unit-tests/varmod-tail.mk index a8078cc67335..05eae481fe3e 100644 --- a/unit-tests/varmod-tail.mk +++ b/unit-tests/varmod-tail.mk @@ -1,9 +1,9 @@ -# $NetBSD: varmod-tail.mk,v 1.3 2020/08/23 15:09:15 rillig Exp $ +# $NetBSD: varmod-tail.mk,v 1.4 2020/12/20 22:57:40 rillig Exp $ # # Tests for the :T variable modifier, which returns the basename of each of # the words in the variable value. all: -.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a +.for path in a/b/c def a.b.c a.b/c a a.a .gitignore a a.a trailing/ @echo "tail (basename) of '"${path:Q}"' is '"${path:T:Q}"'" .endfor diff --git a/unit-tests/varmod-to-many-words.mk b/unit-tests/varmod-to-many-words.mk index 10cddb00c5e4..e96962ce4136 100644 --- a/unit-tests/varmod-to-many-words.mk +++ b/unit-tests/varmod-to-many-words.mk @@ -1,9 +1,21 @@ -# $NetBSD: varmod-to-many-words.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: varmod-to-many-words.mk,v 1.3 2020/12/20 23:29:50 rillig Exp $ # # Tests for the :tw modifier, which treats the variable as many words, # to undo a previous :tW modifier. -# TODO: Implementation +SENTENCE= The quick brown fox jumps over the lazy brown dog. + +.if ${SENTENCE:tw:[#]} != 10 +. error +.endif +.if ${SENTENCE:tW:[#]} != 1 +. error +.endif + +# Protect against accidental freeing of the variable value. +.if ${SENTENCE} != "The quick brown fox jumps over the lazy brown dog." +. error +.endif all: @:; diff --git a/unit-tests/varmod-to-one-word.mk b/unit-tests/varmod-to-one-word.mk index 0865ce8fb41f..e4e2e99781f2 100644 --- a/unit-tests/varmod-to-one-word.mk +++ b/unit-tests/varmod-to-one-word.mk @@ -1,9 +1,21 @@ -# $NetBSD: varmod-to-one-word.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: varmod-to-one-word.mk,v 1.3 2020/12/20 23:29:50 rillig Exp $ # # Tests for the :tW variable modifier, which treats the variable value # as a single word, for all following modifiers. -# TODO: Implementation +SENTENCE= The quick brown fox jumps over the lazy brown dog. + +.if ${SENTENCE:tW:[#]} != 1 +. error +.endif +.if ${SENTENCE:tw:[#]} != 10 +. error +.endif + +# Protect against accidental freeing of the variable value. +.if ${SENTENCE} != "The quick brown fox jumps over the lazy brown dog." +. error +.endif all: @:; diff --git a/unit-tests/varmod-to-separator.exp b/unit-tests/varmod-to-separator.exp index a3c323ac123a..44c9f0973ed9 100644 --- a/unit-tests/varmod-to-separator.exp +++ b/unit-tests/varmod-to-separator.exp @@ -1,21 +1,19 @@ make: "varmod-to-separator.mk" line 107: Invalid character number: 400:tu} - make: "varmod-to-separator.mk" line 107: Malformed conditional (${WORDS:[1..3]:ts\400:tu}) make: "varmod-to-separator.mk" line 121: Invalid character number: 100:tu} - make: "varmod-to-separator.mk" line 121: Malformed conditional (${WORDS:[1..3]:ts\x100:tu}) make: Bad modifier `:ts\-300' for WORDS make: "varmod-to-separator.mk" line 128: Malformed conditional (${WORDS:[1..3]:ts\-300:tu}) make: Bad modifier `:ts\8' for 1 2 3 make: "varmod-to-separator.mk" line 136: Malformed conditional (${1 2 3:L:ts\8:tu}) make: Bad modifier `:ts\100L' for 1 2 3 make: "varmod-to-separator.mk" line 143: Malformed conditional (${1 2 3:L:ts\100L}) make: Bad modifier `:ts\x40g' for 1 2 3 make: "varmod-to-separator.mk" line 150: Malformed conditional (${1 2 3:L:ts\x40g}) make: Bad modifier `:tx' for WORDS make: "varmod-to-separator.mk" line 158: Malformed conditional (${WORDS:tx} != "anything") make: Bad modifier `:t\X' for WORDS make: "varmod-to-separator.mk" line 165: Malformed conditional (${WORDS:t\X} != "anything") make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/varmod.exp b/unit-tests/varmod.exp index a80979e1410d..e36c4ded9b47 100644 --- a/unit-tests/varmod.exp +++ b/unit-tests/varmod.exp @@ -1,8 +1,8 @@ make: "varmod.mk" line 42: To escape a dollar, use \$, not $$, at "$$:L} != """ make: "varmod.mk" line 42: Invalid variable name ':', at "$:L} != """ make: "varmod.mk" line 47: Dollar followed by nothing make: "varmod.mk" line 56: Missing delimiter ':' after modifier "P" -make: "varmod.mk" line 57: Unknown directive "error" +make: "varmod.mk" line 57: Missing argument for ".error" make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 diff --git a/unit-tests/varmod.mk b/unit-tests/varmod.mk index b496bdd206a2..21ddf9103251 100644 --- a/unit-tests/varmod.mk +++ b/unit-tests/varmod.mk @@ -1,60 +1,60 @@ -# $NetBSD: varmod.mk,v 1.4 2020/11/02 17:30:22 rillig Exp $ +# $NetBSD: varmod.mk,v 1.5 2020/12/19 22:33:11 rillig Exp $ # # Tests for variable modifiers, such as :Q, :S,from,to or :Ufallback. DOLLAR1= $$ DOLLAR2= ${:U\$} # To get a single '$' sign in the value of a variable expression, it has to # be written as '$$' in a literal variable value. # # See Var_Parse, where it calls Var_Subst. .if ${DOLLAR1} != "\$" . error .endif # Another way to get a single '$' sign is to use the :U modifier. In the # argument of that modifier, a '$' is escaped using the backslash instead. # # See Var_Parse, where it calls Var_Subst. .if ${DOLLAR2} != "\$" . error .endif # It is also possible to use the :U modifier directly in the expression. # # See Var_Parse, where it calls Var_Subst. .if ${:U\$} != "\$" . error .endif # XXX: As of 2020-09-13, it is not possible to use '$$' in a variable name # to mean a single '$'. This contradicts the manual page, which says that # '$' can be escaped as '$$'. .if ${$$:L} != "" . error .endif # In lint mode, make prints helpful error messages. # For compatibility, make does not print these error messages in normal mode. # Should it? .MAKEFLAGS: -dL .if ${$$:L} != "" . error .endif # A '$' followed by nothing is an error as well. .if ${:Uword:@word@${word}$@} != "word" . error .endif # The variable modifier :P does not fall back to the SysV modifier. # Therefore the modifier :P=RE generates a parse error. # XXX: The .error should not be reached since the variable expression is -# malformed. +# malformed, and this error should be propagated up to Cond_EvalLine. VAR= STOP .if ${VAR:P=RE} != "STORE" . error .endif all: # nothing diff --git a/unit-tests/varname-dot-makeflags.exp b/unit-tests/varname-dot-makeflags.exp new file mode 100644 index 000000000000..dbf96469f86b --- /dev/null +++ b/unit-tests/varname-dot-makeflags.exp @@ -0,0 +1,3 @@ +echo "$MAKEFLAGS" + -r -k -d 00000 -D VARNAME WITH SPACES +exit status 0 diff --git a/unit-tests/varname-dot-makeflags.mk b/unit-tests/varname-dot-makeflags.mk new file mode 100644 index 000000000000..10d1903022cb --- /dev/null +++ b/unit-tests/varname-dot-makeflags.mk @@ -0,0 +1,15 @@ +# $NetBSD: varname-dot-makeflags.mk,v 1.1 2020/12/01 20:37:30 rillig Exp $ +# +# Tests for the special .MAKEFLAGS variable, which collects almost all +# command line arguments and passes them on to any child processes via +# the environment variable MAKEFLAGS (without leading '.'). + +# When options are parsed, the option and its argument are appended as +# separate words to .MAKEFLAGS. Special characters in the option argument +# are not quoted though. It seems to have not been necessary at least from +# 1993 until 2020. +.MAKEFLAGS: -d00000 -D"VARNAME WITH SPACES" + +all: + echo "$$MAKEFLAGS" + @:; diff --git a/unit-tests/varname-dot-shell.exp b/unit-tests/varname-dot-shell.exp index f219515444cf..46a1b2127c98 100755 --- a/unit-tests/varname-dot-shell.exp +++ b/unit-tests/varname-dot-shell.exp @@ -1,32 +1,32 @@ ParseReadLine (10): 'ORIG_SHELL:= ${.SHELL}' Global:ORIG_SHELL = -Var_Parse: ${.SHELL} with VARE_WANTRES|VARE_KEEP_DOLLAR +Var_Parse: ${.SHELL} with VARE_WANTRES|VARE_KEEP_DOLLAR|VARE_KEEP_UNDEF Global:delete .SHELL (not found) Command:.SHELL = (details omitted) Global:ORIG_SHELL = (details omitted) ParseReadLine (12): '.SHELL= overwritten' Global:.SHELL = overwritten CondParser_Eval: ${.SHELL} != ${ORIG_SHELL} Var_Parse: ${.SHELL} != ${ORIG_SHELL} with VARE_UNDEFERR|VARE_WANTRES Var_Parse: ${ORIG_SHELL} with VARE_UNDEFERR|VARE_WANTRES lhs = "(details omitted)", rhs = "(details omitted)", op = != ParseReadLine (19): '.MAKEFLAGS: .SHELL+=appended' ParseDoDependency(.MAKEFLAGS: .SHELL+=appended) Ignoring append to .SHELL since it is read-only CondParser_Eval: ${.SHELL} != ${ORIG_SHELL} Var_Parse: ${.SHELL} != ${ORIG_SHELL} with VARE_UNDEFERR|VARE_WANTRES Var_Parse: ${ORIG_SHELL} with VARE_UNDEFERR|VARE_WANTRES lhs = "(details omitted)", rhs = "(details omitted)", op = != ParseReadLine (27): '.undef .SHELL' Global:delete .SHELL ParseReadLine (28): '.SHELL= newly overwritten' Global:.SHELL = newly overwritten CondParser_Eval: ${.SHELL} != ${ORIG_SHELL} Var_Parse: ${.SHELL} != ${ORIG_SHELL} with VARE_UNDEFERR|VARE_WANTRES Var_Parse: ${ORIG_SHELL} with VARE_UNDEFERR|VARE_WANTRES lhs = "(details omitted)", rhs = "(details omitted)", op = != ParseReadLine (33): '.MAKEFLAGS: -d0' ParseDoDependency(.MAKEFLAGS: -d0) Global:.MAKEFLAGS = -r -k -d cpv -d Global:.MAKEFLAGS = -r -k -d cpv -d 0 exit status 0 diff --git a/unit-tests/varname-make_print_var_on_error-jobs.exp b/unit-tests/varname-make_print_var_on_error-jobs.exp index 057c09dcbcf6..81bea0e99ae9 100644 --- a/unit-tests/varname-make_print_var_on_error-jobs.exp +++ b/unit-tests/varname-make_print_var_on_error-jobs.exp @@ -1,7 +1,8 @@ -fail +echo fail all; false 'all' '${.TARGET}' '$${.TARGET}' +fail all *** [all] Error code 1 make: stopped in unit-tests .ERROR_TARGET='all' -.ERROR_CMD='@: command before @echo fail; false @: command after, with variable expressions expanded' +.ERROR_CMD='@: before '${.TARGET}' '${.TARGET}' '$${.TARGET}' echo fail ${.TARGET}; false '${.TARGET}' '${.TARGET}' '$${.TARGET}' @: after '${.TARGET}' '${.TARGET}' '$${.TARGET}'' exit status 1 diff --git a/unit-tests/varname-make_print_var_on_error-jobs.mk b/unit-tests/varname-make_print_var_on_error-jobs.mk index 7e611d092f23..d4ab4c8bb711 100644 --- a/unit-tests/varname-make_print_var_on_error-jobs.mk +++ b/unit-tests/varname-make_print_var_on_error-jobs.mk @@ -1,21 +1,28 @@ -# $NetBSD: varname-make_print_var_on_error-jobs.mk,v 1.1 2020/10/23 06:18:23 rillig Exp $ +# $NetBSD: varname-make_print_var_on_error-jobs.mk,v 1.2 2020/12/13 19:08:20 rillig Exp $ # # Tests for the special MAKE_PRINT_VAR_ON_ERROR variable, which prints the # values of selected variables on error. # # The variable .ERROR_CMD contains all commands of the target, with variable # expressions expanded, just as they were printed to the shell command file. # # The commands in .ERROR_CMD are space-separated. Since each command usually # contains spaces as well, this value is only intended as a first hint to what # happened. For more details, use the debug options -de, -dj, -dl, -dn, -dx. +# +# See also: +# compat-error.mk + +# XXX: As of 2020-12-13, PrintOnError calls Var_Subst with VAR_GLOBAL, which +# does not expand the node-local variables like .TARGET. This results in the +# double '${.TARGET}' in the output. # As of 2020-10-23, .ERROR_CMD only works in parallel mode. .MAKEFLAGS: -j1 MAKE_PRINT_VAR_ON_ERROR= .ERROR_TARGET .ERROR_CMD all: - @: command before - @echo fail; false - @: command after${:U, with variable expressions expanded} + @: before '${.TARGET}' '$${.TARGET}' '$$$${.TARGET}' + echo fail ${.TARGET}; false '${.TARGET}' '$${.TARGET}' '$$$${.TARGET}' + @: after '${.TARGET}' '$${.TARGET}' '$$$${.TARGET}' diff --git a/unit-tests/varname-make_print_var_on_error.exp b/unit-tests/varname-make_print_var_on_error.exp index e2f6a429a9fc..f23deb3568d6 100644 --- a/unit-tests/varname-make_print_var_on_error.exp +++ b/unit-tests/varname-make_print_var_on_error.exp @@ -1,8 +1,9 @@ -fail +echo fail all; false 'all' '${.TARGET}' '$${.TARGET}' +fail all *** Error code 1 (continuing) Stop. make: stopped in unit-tests .ERROR_TARGET='all' .ERROR_CMD='' exit status 1 diff --git a/unit-tests/varname-make_print_var_on_error.mk b/unit-tests/varname-make_print_var_on_error.mk index 9ea78cb2cb4a..3c498febc386 100644 --- a/unit-tests/varname-make_print_var_on_error.mk +++ b/unit-tests/varname-make_print_var_on_error.mk @@ -1,16 +1,23 @@ -# $NetBSD: varname-make_print_var_on_error.mk,v 1.4 2020/10/23 06:18:23 rillig Exp $ +# $NetBSD: varname-make_print_var_on_error.mk,v 1.5 2020/12/13 19:08:20 rillig Exp $ # # Tests for the special MAKE_PRINT_VAR_ON_ERROR variable, which prints the # values of selected variables on error. # XXX: As of 2020-10-23, the .ERROR_CMD variable is pointless in compat mode # since at the point where it is filled in PrintOnError, the first command in # gn->commands has been set to NULL already. This leaves .ERROR_CMD an empty # list. +# +# See also: +# compat-error.mk + +# XXX: As of 2020-12-13, PrintOnError calls Var_Subst with VAR_GLOBAL, which +# does not expand the node-local variables like .TARGET. This results in the +# double '${.TARGET}' in the output. MAKE_PRINT_VAR_ON_ERROR= .ERROR_TARGET .ERROR_CMD all: - @: command before - @echo fail; false - @: command after + @: before '${.TARGET}' '$${.TARGET}' '$$$${.TARGET}' + echo fail ${.TARGET}; false '${.TARGET}' '$${.TARGET}' '$$$${.TARGET}' + @: after '${.TARGET}' '$${.TARGET}' '$$$${.TARGET}' diff --git a/unit-tests/varname-makeflags.mk b/unit-tests/varname-makeflags.mk index b2e5f68b4e08..3b4fd91c3f57 100644 --- a/unit-tests/varname-makeflags.mk +++ b/unit-tests/varname-makeflags.mk @@ -1,8 +1,26 @@ -# $NetBSD: varname-makeflags.mk,v 1.2 2020/08/16 14:25:16 rillig Exp $ +# $NetBSD: varname-makeflags.mk,v 1.3 2020/12/01 20:37:30 rillig Exp $ # -# Tests for the special MAKEFLAGS variable. +# Tests for the special MAKEFLAGS variable, which is basically just a normal +# environment variable. It is closely related to .MAKEFLAGS but captures the +# state of .MAKEFLAGS at the very beginning of make, before any makefiles are +# read. # TODO: Implementation +.MAKEFLAGS: -d0 + +# The unit tests are run with an almost empty environment. In particular, +# the variable MAKEFLAGS is not set. The '.MAKEFLAGS:' above also doesn't +# influence the environment variable MAKEFLAGS, therefore it is still +# undefined at this point. +.if ${MAKEFLAGS:Uundefined} != "undefined" +. error +.endif + +# The special variable .MAKEFLAGS is influenced though. +# See varname-dot-makeflags.mk for more details. +.if ${.MAKEFLAGS} != " -r -k -d 0" +. error +.endif + all: - @:; diff --git a/unit-tests/varparse-dynamic.mk b/unit-tests/varparse-dynamic.mk index 228eb17475b0..29051d31eeea 100644 --- a/unit-tests/varparse-dynamic.mk +++ b/unit-tests/varparse-dynamic.mk @@ -1,25 +1,35 @@ -# $NetBSD: varparse-dynamic.mk,v 1.2 2020/09/13 21:00:34 rillig Exp $ +# $NetBSD: varparse-dynamic.mk,v 1.3 2020/11/21 15:48:05 rillig Exp $ # Before 2020-07-27, there was an off-by-one error in Var_Parse that skipped # the last character in the variable name. # To trigger the bug, the variable must not be defined. .if ${.TARGET} # exact match, may be undefined .endif .if ${.TARGEX} # 1 character difference, must be defined .endif .if ${.TARGXX} # 2 characters difference, must be defined .endif # When a dynamic variable (such as .TARGET) is evaluated in the global # context, it is not yet ready to be expanded. Therefore the complete # expression is returned as the variable value, hoping that it can be # resolved at a later point. # # This test covers the code in Var_Parse that deals with VAR_JUNK but not # VAR_KEEP for dynamic variables. .if ${.TARGET:S,^,,} != "\${.TARGET:S,^,,}" . error .endif +# If a dynamic variable is expanded in a non-local context, the expression +# based on this variable is not expanded. But there may be nested variable +# expressions in the modifiers, and these are kept unexpanded as well. +.if ${.TARGET:M${:Ufallback}} != "\${.TARGET:M\${:Ufallback}}" +. error +.endif +.if ${.TARGET:M${UNDEF}} != "\${.TARGET:M\${UNDEF}}" +. error +.endif + all: @: diff --git a/unit-tests/varparse-errors.exp b/unit-tests/varparse-errors.exp index 39a9383953dd..50a0766c7d70 100644 --- a/unit-tests/varparse-errors.exp +++ b/unit-tests/varparse-errors.exp @@ -1 +1,5 @@ -exit status 0 +make: "varparse-errors.mk" line 38: Unknown modifier 'Z' +make: "varparse-errors.mk" line 46: Unknown modifier 'Z' +make: Fatal errors encountered -- cannot continue +make: stopped in unit-tests +exit status 1 diff --git a/unit-tests/varparse-errors.mk b/unit-tests/varparse-errors.mk index 42f5b65a728e..113c7a292a79 100644 --- a/unit-tests/varparse-errors.mk +++ b/unit-tests/varparse-errors.mk @@ -1,35 +1,51 @@ -# $NetBSD: varparse-errors.mk,v 1.1 2020/11/08 16:44:47 rillig Exp $ +# $NetBSD: varparse-errors.mk,v 1.3 2020/12/20 19:47:34 rillig Exp $ # Tests for parsing and evaluating all kinds of variable expressions. # # This is the basis for redesigning the error handling in Var_Parse and # Var_Subst, collecting typical and not so typical use cases. # # See also: # VarParseResult # Var_Parse # Var_Subst PLAIN= plain value LITERAL_DOLLAR= To get a dollar, double $$ it. INDIRECT= An ${:Uindirect} value. REF_UNDEF= A reference to an ${UNDEF}undefined variable. ERR_UNCLOSED= An ${UNCLOSED variable expression. ERR_BAD_MOD= An ${:Uindirect:Z} expression with an unknown modifier. ERR_EVAL= An evaluation error ${:Uvalue:C,.,\3,}. # In a conditional, a variable expression that is not enclosed in quotes is # expanded using the flags VARE_UNDEFERR and VARE_WANTRES. # The variable itself must be defined. # It may refer to undefined variables though. .if ${REF_UNDEF} != "A reference to an undefined variable." . error .endif +# As of 2020-12-01, errors in the variable name are silently ignored. +# Since var.c 1.754 from 2020-12-20, unknown modifiers at parse time result +# in an error message and a non-zero exit status. +VAR.${:U:Z}= unknown modifier in the variable name +.if ${VAR.} != "unknown modifier in the variable name" +. error +.endif + +# As of 2020-12-01, errors in the variable name are silently ignored. +# Since var.c 1.754 from 2020-12-20, unknown modifiers at parse time result +# in an error message and a non-zero exit status. +VAR.${:U:Z}post= unknown modifier with text in the variable name +.if ${VAR.post} != "unknown modifier with text in the variable name" +. error +.endif + all: diff --git a/util.c b/util.c index a5d867d9df91..6143e4c462d2 100644 --- a/util.c +++ b/util.c @@ -1,587 +1,588 @@ -/* $NetBSD: util.c,v 1.68 2020/11/16 18:29:49 rillig Exp $ */ +/* $NetBSD: util.c,v 1.73 2020/12/30 10:03:16 rillig Exp $ */ /* * Missing stuff from OS's * - * $Id: util.c,v 1.41 2020/11/18 03:58:32 sjg Exp $ + * $Id: util.c,v 1.45 2021/01/01 22:55:09 sjg Exp $ */ #include #include #include #include #include "make.h" -MAKE_RCSID("$NetBSD: util.c,v 1.68 2020/11/16 18:29:49 rillig Exp $"); +MAKE_RCSID("$NetBSD: util.c,v 1.73 2020/12/30 10:03:16 rillig Exp $"); #if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR) extern int errno, sys_nerr; extern char *sys_errlist[]; char * strerror(int e) { static char buf[100]; if (e < 0 || e >= sys_nerr) { snprintf(buf, sizeof buf, "Unknown error %d", e); return buf; } else return sys_errlist[e]; } #endif #if !defined(HAVE_GETENV) || !defined(HAVE_SETENV) || !defined(HAVE_UNSETENV) extern char **environ; static char * findenv(const char *name, int *offset) { size_t i, len; char *p, *q; len = strlen(name); for (i = 0; (q = environ[i]); i++) { p = strchr(q, '='); if (p == NULL || p - q != len) continue; if (strncmp(name, q, len) == 0) { *offset = i; return q + len + 1; } } *offset = i; return NULL; } char * getenv(const char *name) { int offset; return findenv(name, &offset); } int unsetenv(const char *name) { char **p; int offset; if (name == NULL || *name == '\0' || strchr(name, '=') != NULL) { errno = EINVAL; return -1; } while (findenv(name, &offset)) { /* if set multiple times */ for (p = &environ[offset];; ++p) if (!(*p = *(p + 1))) break; } return 0; } int setenv(const char *name, const char *value, int rewrite) { char *c, **newenv; const char *cc; size_t l_value, size; int offset; if (name == NULL || value == NULL) { errno = EINVAL; return -1; } if (*value == '=') /* no `=' in value */ value++; l_value = strlen(value); /* find if already exists */ if ((c = findenv(name, &offset))) { if (!rewrite) return 0; if (strlen(c) >= l_value) /* old larger; copy over */ goto copy; } else { /* create new slot */ size = sizeof(char *) * (offset + 2); if (savedEnv == environ) { /* just increase size */ if ((newenv = realloc(savedEnv, size)) == NULL) return -1; savedEnv = newenv; } else { /* get new space */ /* * We don't free here because we don't know if * the first allocation is valid on all OS's */ if ((savedEnv = malloc(size)) == NULL) return -1; (void)memcpy(savedEnv, environ, size - sizeof(char *)); } environ = savedEnv; environ[offset + 1] = NULL; } for (cc = name; *cc && *cc != '='; ++cc) /* no `=' in name */ continue; size = cc - name; /* name + `=' + value */ if ((environ[offset] = malloc(size + l_value + 2)) == NULL) return -1; c = environ[offset]; (void)memcpy(c, name, size); c += size; *c++ = '='; copy: (void)memcpy(c, value, l_value + 1); return 0; } #ifdef TEST int main(int argc, char *argv[]) { setenv(argv[1], argv[2], 0); printf("%s\n", getenv(argv[1])); unsetenv(argv[1]); printf("%s\n", getenv(argv[1])); return 0; } #endif #endif #if defined(__hpux__) || defined(__hpux) -/* strrcpy(): +/* + * strrcpy(): * Like strcpy, going backwards and returning the new pointer */ static char * strrcpy(char *ptr, char *str) { int len = strlen(str); - while (len) + while (len != 0) *--ptr = str[--len]; return ptr; } /* end strrcpy */ char *sys_siglist[] = { "Signal 0", - "Hangup", /* SIGHUP */ - "Interrupt", /* SIGINT */ - "Quit", /* SIGQUIT */ - "Illegal instruction", /* SIGILL */ - "Trace/BPT trap", /* SIGTRAP */ - "IOT trap", /* SIGIOT */ - "EMT trap", /* SIGEMT */ - "Floating point exception", /* SIGFPE */ - "Killed", /* SIGKILL */ - "Bus error", /* SIGBUS */ - "Segmentation fault", /* SIGSEGV */ - "Bad system call", /* SIGSYS */ - "Broken pipe", /* SIGPIPE */ - "Alarm clock", /* SIGALRM */ - "Terminated", /* SIGTERM */ - "User defined signal 1", /* SIGUSR1 */ - "User defined signal 2", /* SIGUSR2 */ - "Child exited", /* SIGCLD */ - "Power-fail restart", /* SIGPWR */ - "Virtual timer expired", /* SIGVTALRM */ - "Profiling timer expired", /* SIGPROF */ - "I/O possible", /* SIGIO */ - "Window size changes", /* SIGWINDOW */ - "Stopped (signal)", /* SIGSTOP */ - "Stopped", /* SIGTSTP */ - "Continued", /* SIGCONT */ - "Stopped (tty input)", /* SIGTTIN */ - "Stopped (tty output)", /* SIGTTOU */ - "Urgent I/O condition", /* SIGURG */ - "Remote lock lost (NFS)", /* SIGLOST */ - "Signal 31", /* reserved */ - "DIL signal" /* SIGDIL */ + "Hangup", /* SIGHUP */ + "Interrupt", /* SIGINT */ + "Quit", /* SIGQUIT */ + "Illegal instruction", /* SIGILL */ + "Trace/BPT trap", /* SIGTRAP */ + "IOT trap", /* SIGIOT */ + "EMT trap", /* SIGEMT */ + "Floating point exception", /* SIGFPE */ + "Killed", /* SIGKILL */ + "Bus error", /* SIGBUS */ + "Segmentation fault", /* SIGSEGV */ + "Bad system call", /* SIGSYS */ + "Broken pipe", /* SIGPIPE */ + "Alarm clock", /* SIGALRM */ + "Terminated", /* SIGTERM */ + "User defined signal 1", /* SIGUSR1 */ + "User defined signal 2", /* SIGUSR2 */ + "Child exited", /* SIGCLD */ + "Power-fail restart", /* SIGPWR */ + "Virtual timer expired", /* SIGVTALRM */ + "Profiling timer expired", /* SIGPROF */ + "I/O possible", /* SIGIO */ + "Window size changes", /* SIGWINDOW */ + "Stopped (signal)", /* SIGSTOP */ + "Stopped", /* SIGTSTP */ + "Continued", /* SIGCONT */ + "Stopped (tty input)", /* SIGTTIN */ + "Stopped (tty output)", /* SIGTTOU */ + "Urgent I/O condition", /* SIGURG */ + "Remote lock lost (NFS)", /* SIGLOST */ + "Signal 31", /* reserved */ + "DIL signal" /* SIGDIL */ }; #endif /* __hpux__ || __hpux */ #if defined(__hpux__) || defined(__hpux) #include #include #include #include #include #include #include int killpg(int pid, int sig) { return kill(-pid, sig); } #if !defined(BSD) && !defined(d_fileno) # define d_fileno d_ino #endif #ifndef DEV_DEV_COMPARE # define DEV_DEV_COMPARE(a, b) ((a) == (b)) #endif #define ISDOT(c) ((c)[0] == '.' && (((c)[1] == '\0') || ((c)[1] == '/'))) #define ISDOTDOT(c) ((c)[0] == '.' && ISDOT(&((c)[1]))) char * getwd(char *pathname) { DIR *dp; struct dirent *d; extern int errno; struct stat st_root, st_cur, st_next, st_dotdot; char pathbuf[MAXPATHLEN], nextpathbuf[MAXPATHLEN * 2]; char *pathptr, *nextpathptr, *cur_name_add; /* find the inode of root */ if (stat("/", &st_root) == -1) { (void)sprintf(pathname, "getwd: Cannot stat \"/\" (%s)", strerror(errno)); return NULL; } pathbuf[MAXPATHLEN - 1] = '\0'; pathptr = &pathbuf[MAXPATHLEN - 1]; nextpathbuf[MAXPATHLEN - 1] = '\0'; cur_name_add = nextpathptr = &nextpathbuf[MAXPATHLEN - 1]; /* find the inode of the current directory */ if (lstat(".", &st_cur) == -1) { (void)sprintf(pathname, "getwd: Cannot stat \".\" (%s)", strerror(errno)); return NULL; } nextpathptr = strrcpy(nextpathptr, "../"); /* Descend to root */ for (;;) { /* look if we found root yet */ if (st_cur.st_ino == st_root.st_ino && DEV_DEV_COMPARE(st_cur.st_dev, st_root.st_dev)) { (void)strcpy(pathname, *pathptr != '/' ? "/" : pathptr); return pathname; } /* open the parent directory */ if (stat(nextpathptr, &st_dotdot) == -1) { (void)sprintf(pathname, "getwd: Cannot stat directory \"%s\" (%s)", nextpathptr, strerror(errno)); return NULL; } if ((dp = opendir(nextpathptr)) == NULL) { (void)sprintf(pathname, "getwd: Cannot open directory \"%s\" (%s)", nextpathptr, strerror(errno)); return NULL; } /* look in the parent for the entry with the same inode */ if (DEV_DEV_COMPARE(st_dotdot.st_dev, st_cur.st_dev)) { /* Parent has same device. No need to stat every member */ for (d = readdir(dp); d != NULL; d = readdir(dp)) if (d->d_fileno == st_cur.st_ino) break; } else { /* * Parent has a different device. This is a mount point so we * need to stat every member */ for (d = readdir(dp); d != NULL; d = readdir(dp)) { if (ISDOT(d->d_name) || ISDOTDOT(d->d_name)) continue; (void)strcpy(cur_name_add, d->d_name); if (lstat(nextpathptr, &st_next) == -1) { (void)sprintf(pathname, "getwd: Cannot stat \"%s\" (%s)", d->d_name, strerror(errno)); (void)closedir(dp); return NULL; } /* check if we found it yet */ if (st_next.st_ino == st_cur.st_ino && DEV_DEV_COMPARE(st_next.st_dev, st_cur.st_dev)) break; } } if (d == NULL) { (void)sprintf(pathname, "getwd: Cannot find \".\" in \"..\""); (void)closedir(dp); return NULL; } st_cur = st_dotdot; pathptr = strrcpy(pathptr, d->d_name); pathptr = strrcpy(pathptr, "/"); nextpathptr = strrcpy(nextpathptr, "../"); (void)closedir(dp); *cur_name_add = '\0'; } } /* end getwd */ #endif /* __hpux */ #if !defined(HAVE_GETCWD) char * getcwd(path, sz) char *path; int sz; { return getwd(path); } #endif /* force posix signals */ SignalProc bmake_signal(int s, SignalProc a) { - struct sigaction sa, osa; + struct sigaction sa, osa; - sa.sa_handler = a; - sigemptyset(&sa.sa_mask); - sa.sa_flags = SA_RESTART; + sa.sa_handler = a; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART; - if (sigaction(s, &sa, &osa) == -1) - return SIG_ERR; - else - return osa.sa_handler; + if (sigaction(s, &sa, &osa) == -1) + return SIG_ERR; + else + return osa.sa_handler; } #if !defined(HAVE_VSNPRINTF) || !defined(HAVE_VASPRINTF) #include #endif #if !defined(HAVE_VSNPRINTF) #if !defined(__osf__) #ifdef _IOSTRG #define STRFLAG (_IOSTRG|_IOWRT) /* no _IOWRT: avoid stdio bug */ #else #if 0 #define STRFLAG (_IOREAD) /* XXX: Assume svr4 stdio */ #endif #endif /* _IOSTRG */ #endif /* __osf__ */ int vsnprintf(char *s, size_t n, const char *fmt, va_list args) { #ifdef STRFLAG FILE fakebuf; fakebuf._flag = STRFLAG; /* * Some os's are char * _ptr, others are unsigned char *_ptr... * We cast to void * to make everyone happy. */ fakebuf._ptr = (void *)s; fakebuf._cnt = n - 1; fakebuf._file = -1; _doprnt(fmt, args, &fakebuf); fakebuf._cnt++; putc('\0', &fakebuf); if (fakebuf._cnt < 0) fakebuf._cnt = 0; return n - fakebuf._cnt - 1; #else #ifndef _PATH_DEVNULL # define _PATH_DEVNULL "/dev/null" #endif /* * Rats... we don't want to clobber anything... * do a printf to /dev/null to see how much space we need. */ static FILE *nullfp; int need = 0; /* XXX what's a useful error return? */ if (!nullfp) nullfp = fopen(_PATH_DEVNULL, "w"); if (nullfp) { need = vfprintf(nullfp, fmt, args); if (need < n) (void)vsprintf(s, fmt, args); } return need; #endif } #endif #if !defined(HAVE_SNPRINTF) int snprintf(char *s, size_t n, const char *fmt, ...) { va_list ap; int rv; va_start(ap, fmt); rv = vsnprintf(s, n, fmt, ap); va_end(ap); return rv; } #endif #if !defined(HAVE_STRFTIME) size_t strftime(char *buf, size_t len, const char *fmt, const struct tm *tm) { static char months[][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; size_t s; char *b = buf; while (*fmt) { if (len == 0) return buf - b; if (*fmt != '%') { *buf++ = *fmt++; len--; continue; } switch (*fmt++) { case '%': *buf++ = '%'; len--; if (len == 0) return buf - b; /*FALLTHROUGH*/ case '\0': *buf = '%'; s = 1; break; case 'k': s = snprintf(buf, len, "%d", tm->tm_hour); break; case 'M': s = snprintf(buf, len, "%02d", tm->tm_min); break; case 'S': s = snprintf(buf, len, "%02d", tm->tm_sec); break; case 'b': if (tm->tm_mon >= 12) return buf - b; s = snprintf(buf, len, "%s", months[tm->tm_mon]); break; case 'd': s = snprintf(buf, len, "%02d", tm->tm_mday); break; case 'Y': s = snprintf(buf, len, "%d", 1900 + tm->tm_year); break; default: s = snprintf(buf, len, "Unsupported format %c", fmt[-1]); break; } buf += s; len -= s; } return buf - b; } #endif #if !defined(HAVE_KILLPG) #if !defined(__hpux__) && !defined(__hpux) int killpg(int pid, int sig) { return kill(-pid, sig); } #endif #endif #if !defined(HAVE_WARNX) static void vwarnx(const char *fmt, va_list args) { fprintf(stderr, "%s: ", progname); if ((fmt)) { vfprintf(stderr, fmt, args); fprintf(stderr, ": "); } } #endif #if !defined(HAVE_WARN) static void vwarn(const char *fmt, va_list args) { vwarnx(fmt, args); fprintf(stderr, "%s\n", strerror(errno)); } #endif #if !defined(HAVE_ERR) static void verr(int eval, const char *fmt, va_list args) { vwarn(fmt, args); exit(eval); } #endif #if !defined(HAVE_ERRX) static void verrx(int eval, const char *fmt, va_list args) { vwarnx(fmt, args); exit(eval); } #endif #if !defined(HAVE_ERR) void err(int eval, const char *fmt, ...) { va_list ap; va_start(ap, fmt); verr(eval, fmt, ap); va_end(ap); } #endif #if !defined(HAVE_ERRX) void errx(int eval, const char *fmt, ...) { va_list ap; va_start(ap, fmt); verrx(eval, fmt, ap); va_end(ap); } #endif #if !defined(HAVE_WARN) void warn(const char *fmt, ...) { va_list ap; va_start(ap, fmt); vwarn(fmt, ap); va_end(ap); } #endif #if !defined(HAVE_WARNX) void warnx(const char *fmt, ...) { va_list ap; va_start(ap, fmt); vwarnx(fmt, ap); va_end(ap); } #endif diff --git a/var.c b/var.c index 80b8d95d82ef..cecd217b47be 100644 --- a/var.c +++ b/var.c @@ -1,4118 +1,4432 @@ -/* $NetBSD: var.c,v 1.689 2020/11/17 20:11:02 rillig Exp $ */ +/* $NetBSD: var.c,v 1.781 2021/01/10 23:59:53 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1989 by Berkeley Softworks * All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam de Boor. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Handling of variables and the expressions formed from them. * * Variables are set using lines of the form VAR=value. Both the variable * name and the value can contain references to other variables, by using * expressions like ${VAR}, ${VAR:Modifiers}, ${${VARNAME}} or ${VAR:${MODS}}. * * Interface: * Var_Init Initialize this module. * * Var_End Clean up the module. * * Var_Set Set the value of the variable, creating it if * necessary. * * Var_Append Append more characters to the variable, creating it if * necessary. A space is placed between the old value and * the new one. * * Var_Exists See if a variable exists. * * Var_Value Return the unexpanded value of a variable, or NULL if * the variable is undefined. * * Var_Subst Substitute all variable expressions in a string. * * Var_Parse Parse a variable expression such as ${VAR:Mpattern}. * * Var_Delete Delete a variable. * - * Var_ExportVars Export some or even all variables to the environment + * Var_ReexportVars + * Export some or even all variables to the environment * of this process and its child processes. * * Var_Export Export the variable to the environment of this process * and its child processes. * * Var_UnExport Don't export the variable anymore. * * Debugging: * Var_Stats Print out hashing statistics if in -dh mode. * * Var_Dump Print out all variables defined in the given context. * * XXX: There's a lot of duplication in these functions. */ #include #include #ifndef NO_REGEX #include #endif #include "make.h" #include #ifdef HAVE_INTTYPES_H #include #elif defined(HAVE_STDINT_H) #include #endif #ifdef HAVE_LIMITS_H #include #endif #include #include "dir.h" #include "job.h" #include "metachar.h" /* "@(#)var.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: var.c,v 1.689 2020/11/17 20:11:02 rillig Exp $"); +MAKE_RCSID("$NetBSD: var.c,v 1.781 2021/01/10 23:59:53 rillig Exp $"); -#define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1) -#define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2) -#define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3) -#define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4) +typedef enum VarFlags { + VAR_NONE = 0, + + /* + * The variable's value is currently being used by Var_Parse or + * Var_Subst. This marker is used to avoid endless recursion. + */ + VAR_IN_USE = 0x01, + + /* + * The variable comes from the environment. + * These variables are not registered in any GNode, therefore they + * must be freed as soon as they are not used anymore. + */ + VAR_FROM_ENV = 0x02, -ENUM_FLAGS_RTTI_3(VarEvalFlags, - VARE_UNDEFERR, VARE_WANTRES, VARE_KEEP_DOLLAR); + /* + * The variable is exported to the environment, to be used by child + * processes. + */ + VAR_EXPORTED = 0x10, + + /* + * At the point where this variable was exported, it contained an + * unresolved reference to another variable. Before any child + * process is started, it needs to be exported again, in the hope + * that the referenced variable can then be resolved. + */ + VAR_REEXPORT = 0x20, + + /* The variable came from the command line. */ + VAR_FROM_CMD = 0x40, + + /* + * The variable value cannot be changed anymore, and the variable + * cannot be deleted. Any attempts to do so are silently ignored, + * they are logged with -dv though. + */ + VAR_READONLY = 0x80 +} VarFlags; + +/* + * Variables are defined using one of the VAR=value assignments. Their + * value can be queried by expressions such as $V, ${VAR}, or with modifiers + * such as ${VAR:S,from,to,g:Q}. + * + * There are 3 kinds of variables: context variables, environment variables, + * undefined variables. + * + * Context variables are stored in a GNode.context. The only way to undefine + * a context variable is using the .undef directive. In particular, it must + * not be possible to undefine a variable during the evaluation of an + * expression, or Var.name might point nowhere. + * + * Environment variables are temporary. They are returned by VarFind, and + * after using them, they must be freed using VarFreeEnv. + * + * Undefined variables occur during evaluation of variable expressions such + * as ${UNDEF:Ufallback} in Var_Parse and ApplyModifiers. + */ +typedef struct Var { + /* + * The name of the variable, once set, doesn't change anymore. + * For context variables, it aliases the corresponding HashEntry name. + * For environment and undefined variables, it is allocated. + */ + FStr name; + + /* The unexpanded value of the variable. */ + Buffer val; + /* Miscellaneous status flags. */ + VarFlags flags; +} Var; + +/* + * Exporting vars is expensive so skip it if we can + */ +typedef enum VarExportedMode { + VAR_EXPORTED_NONE, + VAR_EXPORTED_SOME, + VAR_EXPORTED_ALL +} VarExportedMode; + +typedef enum UnexportWhat { + UNEXPORT_NAMED, + UNEXPORT_ALL, + UNEXPORT_ENV +} UnexportWhat; + +/* Flags for pattern matching in the :S and :C modifiers */ +typedef enum VarPatternFlags { + VARP_NONE = 0, + /* Replace as often as possible ('g') */ + VARP_SUB_GLOBAL = 1 << 0, + /* Replace only once ('1') */ + VARP_SUB_ONE = 1 << 1, + /* Match at start of word ('^') */ + VARP_ANCHOR_START = 1 << 2, + /* Match at end of word ('$') */ + VARP_ANCHOR_END = 1 << 3 +} VarPatternFlags; + +/* SepBuf is a string being built from words, interleaved with separators. */ +typedef struct SepBuf { + Buffer buf; + Boolean needSep; + /* Usually ' ', but see the ':ts' modifier. */ + char sep; +} SepBuf; + + +ENUM_FLAGS_RTTI_4(VarEvalFlags, + VARE_UNDEFERR, VARE_WANTRES, VARE_KEEP_DOLLAR, + VARE_KEEP_UNDEF); /* * This lets us tell if we have replaced the original environ * (which we cannot free). */ char **savedEnv = NULL; -/* Special return value for Var_Parse, indicating a parse error. It may be +/* + * Special return value for Var_Parse, indicating a parse error. It may be * caused by an undefined variable, a syntax error in a modifier or - * something entirely different. */ + * something entirely different. + */ char var_Error[] = ""; -/* Special return value for Var_Parse, indicating an undefined variable in +/* + * Special return value for Var_Parse, indicating an undefined variable in * a case where VARE_UNDEFERR is not set. This undefined variable is * typically a dynamic variable such as ${.TARGET}, whose expansion needs to - * be deferred until it is defined in an actual target. */ + * be deferred until it is defined in an actual target. + */ static char varUndefined[] = ""; /* * Traditionally this make consumed $$ during := like any other expansion. * Other make's do not, and this make follows straight since 2016-01-09. * * This knob allows controlling the behavior. * FALSE to consume $$ during := assignment. * TRUE to preserve $$ during := assignment. */ #define MAKE_SAVE_DOLLARS ".MAKE.SAVE_DOLLARS" static Boolean save_dollars = FALSE; /* * Internally, variables are contained in four different contexts. * 1) the environment. They cannot be changed. If an environment * variable is appended to, the result is placed in the global * context. * 2) the global context. Variables set in the makefiles are located * here. * 3) the command-line context. All variables set on the command line * are placed in this context. * 4) the local context. Each target has associated with it a context * list. On this list are located the structures describing such * local variables as $(@) and $(*) * The four contexts are searched in the reverse order from which they are * listed (but see opts.checkEnvFirst). */ GNode *VAR_INTERNAL; /* variables from make itself */ GNode *VAR_GLOBAL; /* variables from the makefile */ GNode *VAR_CMDLINE; /* variables defined on the command-line */ -typedef enum VarFlags { - - /* The variable's value is currently being used by Var_Parse or Var_Subst. - * This marker is used to avoid endless recursion. */ - VAR_IN_USE = 0x01, - - /* The variable comes from the environment. - * These variables are not registered in any GNode, therefore they must - * be freed as soon as they are not used anymore. */ - VAR_FROM_ENV = 0x02, - - /* The variable is exported to the environment, to be used by child - * processes. */ - VAR_EXPORTED = 0x10, - - /* At the point where this variable was exported, it contained an - * unresolved reference to another variable. Before any child process is - * started, it needs to be exported again, in the hope that the referenced - * variable can then be resolved. */ - VAR_REEXPORT = 0x20, - - /* The variable came from the command line. */ - VAR_FROM_CMD = 0x40, - - /* The variable value cannot be changed anymore, and the variable cannot - * be deleted. Any attempts to do so are ignored. */ - VAR_READONLY = 0x80 -} VarFlags; - ENUM_FLAGS_RTTI_6(VarFlags, VAR_IN_USE, VAR_FROM_ENV, VAR_EXPORTED, VAR_REEXPORT, VAR_FROM_CMD, VAR_READONLY); -/* Variables are defined using one of the VAR=value assignments. Their - * value can be queried by expressions such as $V, ${VAR}, or with modifiers - * such as ${VAR:S,from,to,g:Q}. - * - * There are 3 kinds of variables: context variables, environment variables, - * undefined variables. - * - * Context variables are stored in a GNode.context. The only way to undefine - * a context variable is using the .undef directive. In particular, it must - * not be possible to undefine a variable during the evaluation of an - * expression, or Var.name might point nowhere. - * - * Environment variables are temporary. They are returned by VarFind, and - * after using them, they must be freed using VarFreeEnv. - * - * Undefined variables occur during evaluation of variable expressions such - * as ${UNDEF:Ufallback} in Var_Parse and ApplyModifiers. - */ -typedef struct Var { - /* The name of the variable, once set, doesn't change anymore. - * For context variables, it aliases the corresponding HashEntry name. - * For environment and undefined variables, it is allocated. */ - const char *name; - void *name_freeIt; - - Buffer val; /* its value */ - VarFlags flags; /* miscellaneous status flags */ -} Var; - -/* - * Exporting vars is expensive so skip it if we can - */ -typedef enum VarExportedMode { - VAR_EXPORTED_NONE, - VAR_EXPORTED_SOME, - VAR_EXPORTED_ALL -} VarExportedMode; - static VarExportedMode var_exportedVars = VAR_EXPORTED_NONE; -typedef enum VarExportFlags { - VAR_EXPORT_NORMAL = 0, - /* - * We pass this to Var_Export when doing the initial export - * or after updating an exported var. - */ - VAR_EXPORT_PARENT = 0x01, - /* - * We pass this to Var_Export1 to tell it to leave the value alone. - */ - VAR_EXPORT_LITERAL = 0x02 -} VarExportFlags; - -/* Flags for pattern matching in the :S and :C modifiers */ -typedef enum VarPatternFlags { - VARP_SUB_GLOBAL = 0x01, /* Replace as often as possible ('g') */ - VARP_SUB_ONE = 0x02, /* Replace only once ('1') */ - VARP_ANCHOR_START = 0x04, /* Match at start of word ('^') */ - VARP_ANCHOR_END = 0x08 /* Match at end of word ('$') */ -} VarPatternFlags; static Var * -VarNew(const char *name, void *name_freeIt, const char *value, VarFlags flags) +VarNew(FStr name, const char *value, VarFlags flags) { - size_t value_len = strlen(value); - Var *var = bmake_malloc(sizeof *var); - var->name = name; - var->name_freeIt = name_freeIt; - Buf_InitSize(&var->val, value_len + 1); - Buf_AddBytes(&var->val, value, value_len); - var->flags = flags; - return var; + size_t value_len = strlen(value); + Var *var = bmake_malloc(sizeof *var); + var->name = name; + Buf_InitSize(&var->val, value_len + 1); + Buf_AddBytes(&var->val, value, value_len); + var->flags = flags; + return var; } static const char * CanonicalVarname(const char *name) { - if (*name == '.' && ch_isupper(name[1])) { - switch (name[1]) { - case 'A': - if (strcmp(name, ".ALLSRC") == 0) - name = ALLSRC; - if (strcmp(name, ".ARCHIVE") == 0) - name = ARCHIVE; - break; - case 'I': - if (strcmp(name, ".IMPSRC") == 0) - name = IMPSRC; - break; - case 'M': - if (strcmp(name, ".MEMBER") == 0) - name = MEMBER; - break; - case 'O': - if (strcmp(name, ".OODATE") == 0) - name = OODATE; - break; - case 'P': - if (strcmp(name, ".PREFIX") == 0) - name = PREFIX; - break; - case 'S': - if (strcmp(name, ".SHELL") == 0) { - if (!shellPath) - Shell_Init(); - } - break; - case 'T': - if (strcmp(name, ".TARGET") == 0) - name = TARGET; - break; + if (*name == '.' && ch_isupper(name[1])) { + switch (name[1]) { + case 'A': + if (strcmp(name, ".ALLSRC") == 0) + name = ALLSRC; + if (strcmp(name, ".ARCHIVE") == 0) + name = ARCHIVE; + break; + case 'I': + if (strcmp(name, ".IMPSRC") == 0) + name = IMPSRC; + break; + case 'M': + if (strcmp(name, ".MEMBER") == 0) + name = MEMBER; + break; + case 'O': + if (strcmp(name, ".OODATE") == 0) + name = OODATE; + break; + case 'P': + if (strcmp(name, ".PREFIX") == 0) + name = PREFIX; + break; + case 'S': + if (strcmp(name, ".SHELL") == 0) { + if (shellPath == NULL) + Shell_Init(); + } + break; + case 'T': + if (strcmp(name, ".TARGET") == 0) + name = TARGET; + break; + } } - } - /* GNU make has an additional alias $^ == ${.ALLSRC}. */ + /* GNU make has an additional alias $^ == ${.ALLSRC}. */ - return name; + return name; } static Var * GNode_FindVar(GNode *ctxt, const char *varname, unsigned int hash) { - return HashTable_FindValueHash(&ctxt->context, varname, hash); + return HashTable_FindValueHash(&ctxt->vars, varname, hash); } -/* Find the variable in the context, and maybe in other contexts as well. +/* + * Find the variable in the context, and maybe in other contexts as well. * * Input: * name name to find, is not expanded any further * ctxt context in which to look first * elsewhere TRUE to look in other contexts as well * * Results: * The found variable, or NULL if the variable does not exist. * If the variable is an environment variable, it must be freed using * VarFreeEnv after use. */ static Var * VarFind(const char *name, GNode *ctxt, Boolean elsewhere) { - Var *var; - unsigned int nameHash; - - /* - * If the variable name begins with a '.', it could very well be one of - * the local ones. We check the name against all the local variables - * and substitute the short version in for 'name' if it matches one of - * them. - */ - name = CanonicalVarname(name); - nameHash = Hash_Hash(name); - - /* First look for the variable in the given context. */ - var = GNode_FindVar(ctxt, name, nameHash); - if (!elsewhere) - return var; + Var *var; + unsigned int nameHash; - /* The variable was not found in the given context. Now look for it in - * the other contexts as well. */ - if (var == NULL && ctxt != VAR_CMDLINE) - var = GNode_FindVar(VAR_CMDLINE, name, nameHash); + /* + * If the variable name begins with a '.', it could very well be + * one of the local ones. We check the name against all the local + * variables and substitute the short version in for 'name' if it + * matches one of them. + */ + name = CanonicalVarname(name); + nameHash = Hash_Hash(name); + + /* First look for the variable in the given context. */ + var = GNode_FindVar(ctxt, name, nameHash); + if (!elsewhere) + return var; - if (!opts.checkEnvFirst && var == NULL && ctxt != VAR_GLOBAL) { - var = GNode_FindVar(VAR_GLOBAL, name, nameHash); - if (var == NULL && ctxt != VAR_INTERNAL) { - /* VAR_INTERNAL is subordinate to VAR_GLOBAL */ - var = GNode_FindVar(VAR_INTERNAL, name, nameHash); + /* + * The variable was not found in the given context. + * Now look for it in the other contexts as well. + */ + if (var == NULL && ctxt != VAR_CMDLINE) + var = GNode_FindVar(VAR_CMDLINE, name, nameHash); + + if (!opts.checkEnvFirst && var == NULL && ctxt != VAR_GLOBAL) { + var = GNode_FindVar(VAR_GLOBAL, name, nameHash); + if (var == NULL && ctxt != VAR_INTERNAL) { + /* VAR_INTERNAL is subordinate to VAR_GLOBAL */ + var = GNode_FindVar(VAR_INTERNAL, name, nameHash); + } } - } - if (var == NULL) { - char *env; + if (var == NULL) { + char *env; - if ((env = getenv(name)) != NULL) { - char *varname = bmake_strdup(name); - return VarNew(varname, varname, env, VAR_FROM_ENV); - } + if ((env = getenv(name)) != NULL) { + char *varname = bmake_strdup(name); + return VarNew(FStr_InitOwn(varname), env, VAR_FROM_ENV); + } - if (opts.checkEnvFirst && ctxt != VAR_GLOBAL) { - var = GNode_FindVar(VAR_GLOBAL, name, nameHash); - if (var == NULL && ctxt != VAR_INTERNAL) - var = GNode_FindVar(VAR_INTERNAL, name, nameHash); - return var; - } + if (opts.checkEnvFirst && ctxt != VAR_GLOBAL) { + var = GNode_FindVar(VAR_GLOBAL, name, nameHash); + if (var == NULL && ctxt != VAR_INTERNAL) + var = GNode_FindVar(VAR_INTERNAL, name, + nameHash); + return var; + } - return NULL; - } + return NULL; + } - return var; + return var; } -/* If the variable is an environment variable, free it. +/* + * If the variable is an environment variable, free it. * * Input: * v the variable * freeValue true if the variable value should be freed as well * * Results: * TRUE if it is an environment variable, FALSE otherwise. */ static Boolean VarFreeEnv(Var *v, Boolean freeValue) { - if (!(v->flags & VAR_FROM_ENV)) - return FALSE; + if (!(v->flags & VAR_FROM_ENV)) + return FALSE; - free(v->name_freeIt); - Buf_Destroy(&v->val, freeValue); - free(v); - return TRUE; + FStr_Done(&v->name); + Buf_Destroy(&v->val, freeValue); + free(v); + return TRUE; } -/* Add a new variable of the given name and value to the given context. - * The name and val arguments are duplicated so they may safely be freed. */ +/* + * Add a new variable of the given name and value to the given context. + * The name and val arguments are duplicated so they may safely be freed. + */ static void VarAdd(const char *name, const char *val, GNode *ctxt, VarSetFlags flags) { - HashEntry *he = HashTable_CreateEntry(&ctxt->context, name, NULL); - Var *v = VarNew(he->key /* aliased */, NULL, val, - flags & VAR_SET_READONLY ? VAR_READONLY : 0); - HashEntry_Set(he, v); - if (!(ctxt->flags & INTERNAL)) { - VAR_DEBUG3("%s:%s = %s\n", ctxt->name, name, val); - } + HashEntry *he = HashTable_CreateEntry(&ctxt->vars, name, NULL); + Var *v = VarNew(FStr_InitRefer(/* aliased to */ he->key), val, + flags & VAR_SET_READONLY ? VAR_READONLY : VAR_NONE); + HashEntry_Set(he, v); + if (!(ctxt->flags & INTERNAL)) + DEBUG3(VAR, "%s:%s = %s\n", ctxt->name, name, val); } -/* Remove a variable from a context, freeing all related memory as well. - * The variable name is expanded once. */ +/* + * Remove a variable from a context, freeing all related memory as well. + * The variable name is kept as-is, it is not expanded. + */ void -Var_Delete(const char *name, GNode *ctxt) +Var_DeleteVar(const char *varname, GNode *ctxt) { - char *name_freeIt = NULL; - HashEntry *he; + HashEntry *he = HashTable_FindEntry(&ctxt->vars, varname); + Var *v; - if (strchr(name, '$') != NULL) { - (void)Var_Subst(name, VAR_GLOBAL, VARE_WANTRES, &name_freeIt); - /* TODO: handle errors */ - name = name_freeIt; - } - he = HashTable_FindEntry(&ctxt->context, name); - VAR_DEBUG3("%s:delete %s%s\n", - ctxt->name, name, he != NULL ? "" : " (not found)"); - free(name_freeIt); - - if (he != NULL) { - Var *v = HashEntry_Get(he); + if (he == NULL) { + DEBUG2(VAR, "%s:delete %s (not found)\n", ctxt->name, varname); + return; + } + + DEBUG2(VAR, "%s:delete %s\n", ctxt->name, varname); + v = HashEntry_Get(he); if (v->flags & VAR_EXPORTED) - unsetenv(v->name); - if (strcmp(v->name, MAKE_EXPORTED) == 0) - var_exportedVars = VAR_EXPORTED_NONE; - assert(v->name_freeIt == NULL); - HashTable_DeleteEntry(&ctxt->context, he); + unsetenv(v->name.str); + if (strcmp(v->name.str, MAKE_EXPORTED) == 0) + var_exportedVars = VAR_EXPORTED_NONE; + assert(v->name.freeIt == NULL); + HashTable_DeleteEntry(&ctxt->vars, he); Buf_Destroy(&v->val, TRUE); free(v); - } } -static Boolean -MayExport(const char *name) +/* + * Remove a variable from a context, freeing all related memory as well. + * The variable name is expanded once. + */ +void +Var_Delete(const char *name, GNode *ctxt) { - if (name[0] == '.') - return FALSE; /* skip internals */ - if (name[0] == '-') - return FALSE; /* skip misnamed variables */ - if (name[1] == '\0') { - /* - * A single char. - * If it is one of the vars that should only appear in - * local context, skip it, else we can get Var_Subst - * into a loop. - */ - switch (name[0]) { - case '@': - case '%': - case '*': - case '!': - return FALSE; + FStr varname = FStr_InitRefer(name); + + if (strchr(varname.str, '$') != NULL) { + char *expanded; + (void)Var_Subst(varname.str, VAR_GLOBAL, VARE_WANTRES, + &expanded); + /* TODO: handle errors */ + varname = FStr_InitOwn(expanded); } - } - return TRUE; + + Var_DeleteVar(varname.str, ctxt); + FStr_Done(&varname); } /* - * Export a single variable. - * We ignore make internal variables (those which start with '.'). - * Also we jump through some hoops to avoid calling setenv - * more than necessary since it can leak. - * We only manipulate flags of vars if 'parent' is set. + * Undefine one or more variables from the global scope. + * The argument is expanded exactly once and then split into words. */ -static Boolean -Var_Export1(const char *name, VarExportFlags flags) +void +Var_Undef(const char *arg) { - VarExportFlags parent = flags & VAR_EXPORT_PARENT; - Var *v; - char *val; + VarParseResult vpr; + char *expanded; + Words varnames; + size_t i; - if (!MayExport(name)) - return FALSE; + if (arg[0] == '\0') { + Parse_Error(PARSE_FATAL, + "The .undef directive requires an argument"); + return; + } - v = VarFind(name, VAR_GLOBAL, FALSE); - if (v == NULL) - return FALSE; + vpr = Var_Subst(arg, VAR_GLOBAL, VARE_WANTRES, &expanded); + if (vpr != VPR_OK) { + Parse_Error(PARSE_FATAL, + "Error in variable names to be undefined"); + return; + } - if (!parent && (v->flags & VAR_EXPORTED) && !(v->flags & VAR_REEXPORT)) - return FALSE; /* nothing to do */ + varnames = Str_Words(expanded, FALSE); + if (varnames.len == 1 && varnames.words[0][0] == '\0') + varnames.len = 0; + + for (i = 0; i < varnames.len; i++) { + const char *varname = varnames.words[i]; + Var_DeleteVar(varname, VAR_GLOBAL); + } + + Words_Free(varnames); + free(expanded); +} - val = Buf_GetAll(&v->val, NULL); - if (!(flags & VAR_EXPORT_LITERAL) && strchr(val, '$') != NULL) { +static Boolean +MayExport(const char *name) +{ + if (name[0] == '.') + return FALSE; /* skip internals */ + if (name[0] == '-') + return FALSE; /* skip misnamed variables */ + if (name[1] == '\0') { + /* + * A single char. + * If it is one of the vars that should only appear in + * local context, skip it, else we can get Var_Subst + * into a loop. + */ + switch (name[0]) { + case '@': + case '%': + case '*': + case '!': + return FALSE; + } + } + return TRUE; +} + +static Boolean +ExportVarEnv(Var *v) +{ + const char *name = v->name.str; + char *val = v->val.data; char *expr; - if (parent) { - /* - * Flag the variable as something we need to re-export. - * No point actually exporting it now though, - * the child process can do it at the last minute. - */ - v->flags |= VAR_EXPORTED | VAR_REEXPORT; - return TRUE; + if ((v->flags & VAR_EXPORTED) && !(v->flags & VAR_REEXPORT)) + return FALSE; /* nothing to do */ + + if (strchr(val, '$') == NULL) { + if (!(v->flags & VAR_EXPORTED)) + setenv(name, val, 1); + return TRUE; } + if (v->flags & VAR_IN_USE) { - /* - * We recursed while exporting in a child. - * This isn't going to end well, just skip it. - */ - return FALSE; + /* + * We recursed while exporting in a child. + * This isn't going to end well, just skip it. + */ + return FALSE; } /* XXX: name is injected without escaping it */ expr = str_concat3("${", name, "}"); (void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &val); /* TODO: handle errors */ setenv(name, val, 1); free(val); free(expr); - } else { - if (parent) - v->flags &= ~(unsigned)VAR_REEXPORT; /* once will do */ - if (parent || !(v->flags & VAR_EXPORTED)) - setenv(name, val, 1); - } - - /* - * This is so Var_Set knows to call Var_Export again... - */ - if (parent) { - v->flags |= VAR_EXPORTED; - } - return TRUE; + return TRUE; +} + +static Boolean +ExportVarPlain(Var *v) +{ + if (strchr(v->val.data, '$') == NULL) { + setenv(v->name.str, v->val.data, 1); + v->flags |= VAR_EXPORTED; + v->flags &= ~(unsigned)VAR_REEXPORT; + return TRUE; + } + + /* + * Flag the variable as something we need to re-export. + * No point actually exporting it now though, + * the child process can do it at the last minute. + */ + v->flags |= VAR_EXPORTED | VAR_REEXPORT; + return TRUE; +} + +static Boolean +ExportVarLiteral(Var *v) +{ + if ((v->flags & VAR_EXPORTED) && !(v->flags & VAR_REEXPORT)) + return FALSE; + + if (!(v->flags & VAR_EXPORTED)) + setenv(v->name.str, v->val.data, 1); + + return TRUE; +} + +/* + * Export a single variable. + * + * We ignore make internal variables (those which start with '.'). + * Also we jump through some hoops to avoid calling setenv + * more than necessary since it can leak. + * We only manipulate flags of vars if 'parent' is set. + */ +static Boolean +ExportVar(const char *name, VarExportMode mode) +{ + Var *v; + + if (!MayExport(name)) + return FALSE; + + v = VarFind(name, VAR_GLOBAL, FALSE); + if (v == NULL) + return FALSE; + + if (mode == VEM_ENV) + return ExportVarEnv(v); + else if (mode == VEM_PLAIN) + return ExportVarPlain(v); + else + return ExportVarLiteral(v); } /* - * This gets called from our child processes. + * Actually export the variables that have been marked as needing to be + * re-exported. */ void -Var_ExportVars(void) +Var_ReexportVars(void) { - char *val; - - /* - * Several make's support this sort of mechanism for tracking - * recursion - but each uses a different name. - * We allow the makefiles to update MAKELEVEL and ensure - * children see a correctly incremented value. - */ - char tmp[BUFSIZ]; - snprintf(tmp, sizeof tmp, "%d", makelevel + 1); - setenv(MAKE_LEVEL_ENV, tmp, 1); - - if (var_exportedVars == VAR_EXPORTED_NONE) - return; - - if (var_exportedVars == VAR_EXPORTED_ALL) { - HashIter hi; + char *xvarnames; - /* Ouch! Exporting all variables at once is crazy... */ - HashIter_Init(&hi, &VAR_GLOBAL->context); - while (HashIter_Next(&hi) != NULL) { - Var *var = hi.entry->value; - Var_Export1(var->name, VAR_EXPORT_NORMAL); + /* + * Several make implementations support this sort of mechanism for + * tracking recursion - but each uses a different name. + * We allow the makefiles to update MAKELEVEL and ensure + * children see a correctly incremented value. + */ + char tmp[BUFSIZ]; + snprintf(tmp, sizeof tmp, "%d", makelevel + 1); + setenv(MAKE_LEVEL_ENV, tmp, 1); + + if (var_exportedVars == VAR_EXPORTED_NONE) + return; + + if (var_exportedVars == VAR_EXPORTED_ALL) { + HashIter hi; + + /* Ouch! Exporting all variables at once is crazy... */ + HashIter_Init(&hi, &VAR_GLOBAL->vars); + while (HashIter_Next(&hi) != NULL) { + Var *var = hi.entry->value; + ExportVar(var->name.str, VEM_ENV); + } + return; } - return; - } - (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES, &val); - /* TODO: handle errors */ - if (*val) { - Words words = Str_Words(val, FALSE); + (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES, + &xvarnames); + /* TODO: handle errors */ + if (xvarnames[0] != '\0') { + Words varnames = Str_Words(xvarnames, FALSE); + size_t i; + + for (i = 0; i < varnames.len; i++) + ExportVar(varnames.words[i], VEM_ENV); + Words_Free(varnames); + } + free(xvarnames); +} + +static void +ExportVars(const char *varnames, Boolean isExport, VarExportMode mode) +{ + Words words = Str_Words(varnames, FALSE); size_t i; - for (i = 0; i < words.len; i++) - Var_Export1(words.words[i], VAR_EXPORT_NORMAL); - Words_Free(words); - } - free(val); + if (words.len == 1 && words.words[0][0] == '\0') + words.len = 0; + + for (i = 0; i < words.len; i++) { + const char *varname = words.words[i]; + if (!ExportVar(varname, mode)) + continue; + + if (var_exportedVars == VAR_EXPORTED_NONE) + var_exportedVars = VAR_EXPORTED_SOME; + + if (isExport && mode == VEM_PLAIN) + Var_Append(MAKE_EXPORTED, varname, VAR_GLOBAL); + } + Words_Free(words); +} + +static void +ExportVarsExpand(const char *uvarnames, Boolean isExport, VarExportMode mode) +{ + char *xvarnames; + + (void)Var_Subst(uvarnames, VAR_GLOBAL, VARE_WANTRES, &xvarnames); + /* TODO: handle errors */ + ExportVars(xvarnames, isExport, mode); + free(xvarnames); +} + +/* Export the named variables, or all variables. */ +void +Var_Export(VarExportMode mode, const char *varnames) +{ + if (mode == VEM_PLAIN && varnames[0] == '\0') { + var_exportedVars = VAR_EXPORTED_ALL; /* use with caution! */ + return; + } + + ExportVarsExpand(varnames, TRUE, mode); +} + +void +Var_ExportVars(const char *varnames) +{ + ExportVarsExpand(varnames, FALSE, VEM_PLAIN); +} + + +extern char **environ; + +static void +ClearEnv(void) +{ + const char *cp; + char **newenv; + + cp = getenv(MAKE_LEVEL_ENV); /* we should preserve this */ + if (environ == savedEnv) { + /* we have been here before! */ + newenv = bmake_realloc(environ, 2 * sizeof(char *)); + } else { + if (savedEnv != NULL) { + free(savedEnv); + savedEnv = NULL; + } + newenv = bmake_malloc(2 * sizeof(char *)); + } + + /* Note: we cannot safely free() the original environ. */ + environ = savedEnv = newenv; + newenv[0] = NULL; + newenv[1] = NULL; + if (cp != NULL && *cp != '\0') + setenv(MAKE_LEVEL_ENV, cp, 1); +} + +static void +GetVarnamesToUnexport(Boolean isEnv, const char *arg, + FStr *out_varnames, UnexportWhat *out_what) +{ + UnexportWhat what; + FStr varnames = FStr_InitRefer(""); + + if (isEnv) { + if (arg[0] != '\0') { + Parse_Error(PARSE_FATAL, + "The directive .unexport-env does not take " + "arguments"); + } + what = UNEXPORT_ENV; + + } else { + what = arg[0] != '\0' ? UNEXPORT_NAMED : UNEXPORT_ALL; + if (what == UNEXPORT_NAMED) + varnames = FStr_InitRefer(arg); + } + + if (what != UNEXPORT_NAMED) { + char *expanded; + /* Using .MAKE.EXPORTED */ + (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, + VARE_WANTRES, &expanded); + /* TODO: handle errors */ + varnames = FStr_InitOwn(expanded); + } + + *out_varnames = varnames; + *out_what = what; +} + +static void +UnexportVar(const char *varname, UnexportWhat what) +{ + Var *v = VarFind(varname, VAR_GLOBAL, FALSE); + if (v == NULL) { + DEBUG1(VAR, "Not unexporting \"%s\" (not found)\n", varname); + return; + } + + DEBUG1(VAR, "Unexporting \"%s\"\n", varname); + if (what != UNEXPORT_ENV && + (v->flags & VAR_EXPORTED) && !(v->flags & VAR_REEXPORT)) + unsetenv(v->name.str); + v->flags &= ~(unsigned)(VAR_EXPORTED | VAR_REEXPORT); + + if (what == UNEXPORT_NAMED) { + /* Remove the variable names from .MAKE.EXPORTED. */ + /* XXX: v->name is injected without escaping it */ + char *expr = str_concat3("${" MAKE_EXPORTED ":N", + v->name.str, "}"); + char *cp; + (void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &cp); + /* TODO: handle errors */ + Var_Set(MAKE_EXPORTED, cp, VAR_GLOBAL); + free(cp); + free(expr); + } } -/* - * This is called when .export is seen or .MAKE.EXPORTED is modified. - * - * It is also called when any exported variable is modified. - * XXX: Is it really? - * - * str has the format "[-env|-literal] varname...". - */ -void -Var_Export(const char *str, Boolean isExport) +static void +UnexportVars(FStr *varnames, UnexportWhat what) { - VarExportFlags flags; - char *val; - - if (isExport && str[0] == '\0') { - var_exportedVars = VAR_EXPORTED_ALL; /* use with caution! */ - return; - } - - if (isExport && strncmp(str, "-env", 4) == 0) { - str += 4; - flags = 0; - } else if (isExport && strncmp(str, "-literal", 8) == 0) { - str += 8; - flags = VAR_EXPORT_LITERAL; - } else { - flags = VAR_EXPORT_PARENT; - } - - (void)Var_Subst(str, VAR_GLOBAL, VARE_WANTRES, &val); - /* TODO: handle errors */ - if (val[0] != '\0') { - Words words = Str_Words(val, FALSE); - size_t i; + Words words; + + if (what == UNEXPORT_ENV) + ClearEnv(); + + words = Str_Words(varnames->str, FALSE); for (i = 0; i < words.len; i++) { - const char *name = words.words[i]; - if (Var_Export1(name, flags)) { - if (var_exportedVars == VAR_EXPORTED_NONE) - var_exportedVars = VAR_EXPORTED_SOME; - if (isExport && (flags & VAR_EXPORT_PARENT)) { - Var_Append(MAKE_EXPORTED, name, VAR_GLOBAL); - } - } + const char *varname = words.words[i]; + UnexportVar(varname, what); } Words_Free(words); - } - free(val); -} - -extern char **environ; + if (what != UNEXPORT_NAMED) + Var_Delete(MAKE_EXPORTED, VAR_GLOBAL); +} /* * This is called when .unexport[-env] is seen. * * str must have the form "unexport[-env] varname...". */ void -Var_UnExport(const char *str) +Var_UnExport(Boolean isEnv, const char *arg) { - const char *varnames; - char *varnames_freeIt; - Boolean unexport_env; + UnexportWhat what; + FStr varnames; - varnames = NULL; - varnames_freeIt = NULL; + GetVarnamesToUnexport(isEnv, arg, &varnames, &what); + UnexportVars(&varnames, what); + FStr_Done(&varnames); +} - str += strlen("unexport"); - unexport_env = strncmp(str, "-env", 4) == 0; - if (unexport_env) { - const char *cp; - char **newenv; +/* Set the variable to the value; the name is not expanded. */ +static void +SetVar(const char *name, const char *val, GNode *ctxt, VarSetFlags flags) +{ + Var *v; - cp = getenv(MAKE_LEVEL_ENV); /* we should preserve this */ - if (environ == savedEnv) { - /* we have been here before! */ - newenv = bmake_realloc(environ, 2 * sizeof(char *)); - } else { - if (savedEnv) { - free(savedEnv); - savedEnv = NULL; - } - newenv = bmake_malloc(2 * sizeof(char *)); + if (ctxt == VAR_GLOBAL) { + v = VarFind(name, VAR_CMDLINE, FALSE); + if (v != NULL) { + if (v->flags & VAR_FROM_CMD) { + DEBUG3(VAR, "%s:%s = %s ignored!\n", + ctxt->name, name, val); + return; + } + VarFreeEnv(v, TRUE); + } } - /* Note: we cannot safely free() the original environ. */ - environ = savedEnv = newenv; - newenv[0] = NULL; - newenv[1] = NULL; - if (cp && *cp) - setenv(MAKE_LEVEL_ENV, cp, 1); - } else { - cpp_skip_whitespace(&str); - if (str[0] != '\0') - varnames = str; - } - - if (varnames == NULL) { - /* Using .MAKE.EXPORTED */ - (void)Var_Subst("${" MAKE_EXPORTED ":O:u}", VAR_GLOBAL, VARE_WANTRES, - &varnames_freeIt); - /* TODO: handle errors */ - varnames = varnames_freeIt; - } - - { - Var *v; - size_t i; + /* + * We only look for a variable in the given context since anything set + * here will override anything in a lower context, so there's not much + * point in searching them all just to save a bit of memory... + */ + v = VarFind(name, ctxt, FALSE); + if (v == NULL) { + if (ctxt == VAR_CMDLINE && !(flags & VAR_SET_NO_EXPORT)) { + /* + * This var would normally prevent the same name being + * added to VAR_GLOBAL, so delete it from there if + * needed. Otherwise -V name may show the wrong value. + */ + /* XXX: name is expanded for the second time */ + Var_Delete(name, VAR_GLOBAL); + } + VarAdd(name, val, ctxt, flags); + } else { + if ((v->flags & VAR_READONLY) && !(flags & VAR_SET_READONLY)) { + DEBUG3(VAR, "%s:%s = %s ignored (read-only)\n", + ctxt->name, name, val); + return; + } + Buf_Empty(&v->val); + Buf_AddStr(&v->val, val); - Words words = Str_Words(varnames, FALSE); - for (i = 0; i < words.len; i++) { - const char *varname = words.words[i]; - v = VarFind(varname, VAR_GLOBAL, FALSE); - if (v == NULL) { - VAR_DEBUG1("Not unexporting \"%s\" (not found)\n", varname); - continue; - } - - VAR_DEBUG1("Unexporting \"%s\"\n", varname); - if (!unexport_env && (v->flags & VAR_EXPORTED) && - !(v->flags & VAR_REEXPORT)) - unsetenv(v->name); - v->flags &= ~(unsigned)(VAR_EXPORTED | VAR_REEXPORT); - - /* - * If we are unexporting a list, - * remove each one from .MAKE.EXPORTED. - * If we are removing them all, - * just delete .MAKE.EXPORTED below. - */ - if (varnames == str) { - /* XXX: v->name is injected without escaping it */ - char *expr = str_concat3("${" MAKE_EXPORTED ":N", v->name, "}"); - char *cp; - (void)Var_Subst(expr, VAR_GLOBAL, VARE_WANTRES, &cp); - /* TODO: handle errors */ - Var_Set(MAKE_EXPORTED, cp, VAR_GLOBAL); - free(cp); - free(expr); - } + DEBUG3(VAR, "%s:%s = %s\n", ctxt->name, name, val); + if (v->flags & VAR_EXPORTED) + ExportVar(name, VEM_PLAIN); } - Words_Free(words); - if (varnames != str) { - Var_Delete(MAKE_EXPORTED, VAR_GLOBAL); - free(varnames_freeIt); + /* + * Any variables given on the command line are automatically exported + * to the environment (as per POSIX standard) + * Other than internals. + */ + if (ctxt == VAR_CMDLINE && !(flags & VAR_SET_NO_EXPORT) && + name[0] != '.') { + if (v == NULL) + v = VarFind(name, ctxt, FALSE); /* we just added it */ + v->flags |= VAR_FROM_CMD; + + /* + * If requested, don't export these in the environment + * individually. We still put them in MAKEOVERRIDES so + * that the command-line settings continue to override + * Makefile settings. + */ + if (!opts.varNoExportEnv) + setenv(name, val, 1); + + Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL); } - } + if (name[0] == '.' && strcmp(name, MAKE_SAVE_DOLLARS) == 0) + save_dollars = ParseBoolean(val, save_dollars); + + if (v != NULL) + VarFreeEnv(v, TRUE); } /* See Var_Set for documentation. */ void Var_SetWithFlags(const char *name, const char *val, GNode *ctxt, VarSetFlags flags) { - const char *unexpanded_name = name; - char *name_freeIt = NULL; - Var *v; - - assert(val != NULL); + const char *unexpanded_name = name; + FStr varname = FStr_InitRefer(name); - if (strchr(name, '$') != NULL) { - (void)Var_Subst(name, ctxt, VARE_WANTRES, &name_freeIt); - /* TODO: handle errors */ - name = name_freeIt; - } + assert(val != NULL); - if (name[0] == '\0') { - VAR_DEBUG2("Var_Set(\"%s\", \"%s\", ...) " - "name expands to empty string - ignored\n", - unexpanded_name, val); - free(name_freeIt); - return; - } - - if (ctxt == VAR_GLOBAL) { - v = VarFind(name, VAR_CMDLINE, FALSE); - if (v != NULL) { - if (v->flags & VAR_FROM_CMD) { - VAR_DEBUG3("%s:%s = %s ignored!\n", ctxt->name, name, val); - goto out; - } - VarFreeEnv(v, TRUE); - } - } - - /* - * We only look for a variable in the given context since anything set - * here will override anything in a lower context, so there's not much - * point in searching them all just to save a bit of memory... - */ - v = VarFind(name, ctxt, FALSE); - if (v == NULL) { - if (ctxt == VAR_CMDLINE && !(flags & VAR_SET_NO_EXPORT)) { - /* - * This var would normally prevent the same name being added - * to VAR_GLOBAL, so delete it from there if needed. - * Otherwise -V name may show the wrong value. - */ - /* XXX: name is expanded for the second time */ - Var_Delete(name, VAR_GLOBAL); - } - VarAdd(name, val, ctxt, flags); - } else { - if ((v->flags & VAR_READONLY) && !(flags & VAR_SET_READONLY)) { - VAR_DEBUG3("%s:%s = %s ignored (read-only)\n", - ctxt->name, name, val); - goto out; + if (strchr(varname.str, '$') != NULL) { + char *expanded; + (void)Var_Subst(varname.str, ctxt, VARE_WANTRES, &expanded); + /* TODO: handle errors */ + varname = FStr_InitOwn(expanded); } - Buf_Empty(&v->val); - Buf_AddStr(&v->val, val); - VAR_DEBUG3("%s:%s = %s\n", ctxt->name, name, val); - if (v->flags & VAR_EXPORTED) { - Var_Export1(name, VAR_EXPORT_PARENT); - } - } - /* - * Any variables given on the command line are automatically exported - * to the environment (as per POSIX standard) - * Other than internals. - */ - if (ctxt == VAR_CMDLINE && !(flags & VAR_SET_NO_EXPORT) && name[0] != '.') { - if (v == NULL) - v = VarFind(name, ctxt, FALSE); /* we just added it */ - v->flags |= VAR_FROM_CMD; + if (varname.str[0] == '\0') { + DEBUG2(VAR, "Var_Set(\"%s\", \"%s\", ...) " + "name expands to empty string - ignored\n", + unexpanded_name, val); + } else + SetVar(varname.str, val, ctxt, flags); - /* - * If requested, don't export these in the environment - * individually. We still put them in MAKEOVERRIDES so - * that the command-line settings continue to override - * Makefile settings. - */ - if (!opts.varNoExportEnv) - setenv(name, val, 1); - - Var_Append(MAKEOVERRIDES, name, VAR_GLOBAL); - } - if (name[0] == '.' && strcmp(name, MAKE_SAVE_DOLLARS) == 0) - save_dollars = ParseBoolean(val, save_dollars); - -out: - free(name_freeIt); - if (v != NULL) - VarFreeEnv(v, TRUE); + FStr_Done(&varname); } -/*- - *----------------------------------------------------------------------- - * Var_Set -- - * Set the variable name to the value val in the given context. +/* + * Set the variable name to the value val in the given context. * - * If the variable doesn't yet exist, it is created. - * Otherwise the new value overwrites and replaces the old value. + * If the variable doesn't yet exist, it is created. + * Otherwise the new value overwrites and replaces the old value. * * Input: * name name of the variable to set, is expanded once * val value to give to the variable * ctxt context in which to set it - * - * Notes: - * The variable is searched for only in its context before being - * created in that context. I.e. if the context is VAR_GLOBAL, - * only VAR_GLOBAL->context is searched. Likewise if it is VAR_CMDLINE, - * only VAR_CMDLINE->context is searched. This is done to avoid the - * literally thousands of unnecessary strcmp's that used to be done to - * set, say, $(@) or $(<). - * If the context is VAR_GLOBAL though, we check if the variable - * was set in VAR_CMDLINE from the command line and skip it if so. - *----------------------------------------------------------------------- */ void Var_Set(const char *name, const char *val, GNode *ctxt) { - Var_SetWithFlags(name, val, ctxt, VAR_SET_NONE); + Var_SetWithFlags(name, val, ctxt, VAR_SET_NONE); } -/*- - *----------------------------------------------------------------------- - * Var_Append -- - * The variable of the given name has the given value appended to it in - * the given context. +/* + * The variable of the given name has the given value appended to it in the + * given context. * - * If the variable doesn't exist, it is created. Otherwise the strings - * are concatenated, with a space in between. + * If the variable doesn't exist, it is created. Otherwise the strings are + * concatenated, with a space in between. * * Input: * name name of the variable to modify, is expanded once * val string to append to it * ctxt context in which this should occur * * Notes: * Only if the variable is being sought in the global context is the * environment searched. * XXX: Knows its calling circumstances in that if called with ctxt * an actual target, it will only search that context since only * a local variable could be being appended to. This is actually * a big win and must be tolerated. - *----------------------------------------------------------------------- */ void Var_Append(const char *name, const char *val, GNode *ctxt) { - char *name_freeIt = NULL; - Var *v; + char *name_freeIt = NULL; + Var *v; - assert(val != NULL); + assert(val != NULL); - if (strchr(name, '$') != NULL) { - const char *unexpanded_name = name; - (void)Var_Subst(name, ctxt, VARE_WANTRES, &name_freeIt); - /* TODO: handle errors */ - name = name_freeIt; - if (name[0] == '\0') { - VAR_DEBUG2("Var_Append(\"%s\", \"%s\", ...) " - "name expands to empty string - ignored\n", - unexpanded_name, val); - free(name_freeIt); - return; + if (strchr(name, '$') != NULL) { + const char *unexpanded_name = name; + (void)Var_Subst(name, ctxt, VARE_WANTRES, &name_freeIt); + /* TODO: handle errors */ + name = name_freeIt; + if (name[0] == '\0') { + DEBUG2(VAR, "Var_Append(\"%s\", \"%s\", ...) " + "name expands to empty string - ignored\n", + unexpanded_name, val); + free(name_freeIt); + return; + } } - } - v = VarFind(name, ctxt, ctxt == VAR_GLOBAL); - - if (v == NULL) { - /* XXX: name is expanded for the second time */ - Var_Set(name, val, ctxt); - } else if (v->flags & VAR_READONLY) { - VAR_DEBUG1("Ignoring append to %s since it is read-only\n", name); - } else if (ctxt == VAR_CMDLINE || !(v->flags & VAR_FROM_CMD)) { - Buf_AddByte(&v->val, ' '); - Buf_AddStr(&v->val, val); - - VAR_DEBUG3("%s:%s = %s\n", - ctxt->name, name, Buf_GetAll(&v->val, NULL)); - - if (v->flags & VAR_FROM_ENV) { - /* - * If the original variable came from the environment, we - * have to install it in the global context (we could place - * it in the environment, but then we should provide a way to - * export other variables...) - */ - v->flags &= ~(unsigned)VAR_FROM_ENV; - /* This is the only place where a variable is created whose - * v->name is not the same as ctxt->context->key. */ - HashTable_Set(&ctxt->context, name, v); + v = VarFind(name, ctxt, ctxt == VAR_GLOBAL); + + if (v == NULL) { + /* XXX: name is expanded for the second time */ + Var_Set(name, val, ctxt); + } else if (v->flags & VAR_READONLY) { + DEBUG1(VAR, "Ignoring append to %s since it is read-only\n", + name); + } else if (ctxt == VAR_CMDLINE || !(v->flags & VAR_FROM_CMD)) { + Buf_AddByte(&v->val, ' '); + Buf_AddStr(&v->val, val); + + DEBUG3(VAR, "%s:%s = %s\n", + ctxt->name, name, Buf_GetAll(&v->val, NULL)); + + if (v->flags & VAR_FROM_ENV) { + /* + * If the original variable came from the environment, + * we have to install it in the global context (we + * could place it in the environment, but then we + * should provide a way to export other variables...) + */ + v->flags &= ~(unsigned)VAR_FROM_ENV; + /* + * This is the only place where a variable is + * created whose v->name is not the same as + * ctxt->context->key. + */ + HashTable_Set(&ctxt->vars, name, v); + } } - } - free(name_freeIt); + free(name_freeIt); } -/* See if the given variable exists, in the given context or in other +/* + * See if the given variable exists, in the given context or in other * fallback contexts. * * Input: * name Variable to find, is expanded once * ctxt Context in which to start search */ Boolean Var_Exists(const char *name, GNode *ctxt) { - char *name_freeIt = NULL; - Var *v; + FStr varname = FStr_InitRefer(name); + Var *v; - if (strchr(name, '$') != NULL) { - (void)Var_Subst(name, ctxt, VARE_WANTRES, &name_freeIt); - /* TODO: handle errors */ - name = name_freeIt; - } + if (strchr(varname.str, '$') != NULL) { + char *expanded; + (void)Var_Subst(varname.str, ctxt, VARE_WANTRES, &expanded); + /* TODO: handle errors */ + varname = FStr_InitOwn(expanded); + } - v = VarFind(name, ctxt, TRUE); - free(name_freeIt); - if (v == NULL) - return FALSE; + v = VarFind(varname.str, ctxt, TRUE); + FStr_Done(&varname); + if (v == NULL) + return FALSE; - (void)VarFreeEnv(v, TRUE); - return TRUE; + (void)VarFreeEnv(v, TRUE); + return TRUE; } -/*- - *----------------------------------------------------------------------- - * Var_Value -- - * Return the unexpanded value of the given variable in the given - * context, or the usual contexts. +/* + * Return the unexpanded value of the given variable in the given context, + * or the usual contexts. * * Input: * name name to find, is not expanded any further * ctxt context in which to search for it * * Results: * The value if the variable exists, NULL if it doesn't. * If the returned value is not NULL, the caller must free * out_freeIt when the returned value is no longer needed. - *----------------------------------------------------------------------- */ -const char * -Var_Value(const char *name, GNode *ctxt, void **out_freeIt) +FStr +Var_Value(const char *name, GNode *ctxt) { - Var *v = VarFind(name, ctxt, TRUE); - char *value; + Var *v = VarFind(name, ctxt, TRUE); + char *value; - *out_freeIt = NULL; - if (v == NULL) - return NULL; + if (v == NULL) + return FStr_InitRefer(NULL); - value = Buf_GetAll(&v->val, NULL); - if (VarFreeEnv(v, FALSE)) - *out_freeIt = value; - return value; + value = Buf_GetAll(&v->val, NULL); + return VarFreeEnv(v, FALSE) + ? FStr_InitOwn(value) + : FStr_InitRefer(value); } -/* Return the unexpanded variable value from this node, without trying to look - * up the variable in any other context. */ +/* + * Return the unexpanded variable value from this node, without trying to look + * up the variable in any other context. + */ const char * Var_ValueDirect(const char *name, GNode *ctxt) { - Var *v = VarFind(name, ctxt, FALSE); - return v != NULL ? Buf_GetAll(&v->val, NULL) : NULL; + Var *v = VarFind(name, ctxt, FALSE); + return v != NULL ? Buf_GetAll(&v->val, NULL) : NULL; } -/* SepBuf is a string being built from words, interleaved with separators. */ -typedef struct SepBuf { - Buffer buf; - Boolean needSep; - char sep; /* usually ' ', but see the :ts modifier */ -} SepBuf; - static void SepBuf_Init(SepBuf *buf, char sep) { - Buf_InitSize(&buf->buf, 32); - buf->needSep = FALSE; - buf->sep = sep; + Buf_InitSize(&buf->buf, 32); + buf->needSep = FALSE; + buf->sep = sep; } static void SepBuf_Sep(SepBuf *buf) { - buf->needSep = TRUE; + buf->needSep = TRUE; } static void SepBuf_AddBytes(SepBuf *buf, const char *mem, size_t mem_size) { - if (mem_size == 0) - return; - if (buf->needSep && buf->sep != '\0') { - Buf_AddByte(&buf->buf, buf->sep); - buf->needSep = FALSE; - } - Buf_AddBytes(&buf->buf, mem, mem_size); + if (mem_size == 0) + return; + if (buf->needSep && buf->sep != '\0') { + Buf_AddByte(&buf->buf, buf->sep); + buf->needSep = FALSE; + } + Buf_AddBytes(&buf->buf, mem, mem_size); } static void SepBuf_AddBytesBetween(SepBuf *buf, const char *start, const char *end) { - SepBuf_AddBytes(buf, start, (size_t)(end - start)); + SepBuf_AddBytes(buf, start, (size_t)(end - start)); } static void SepBuf_AddStr(SepBuf *buf, const char *str) { - SepBuf_AddBytes(buf, str, strlen(str)); + SepBuf_AddBytes(buf, str, strlen(str)); } static char * SepBuf_Destroy(SepBuf *buf, Boolean free_buf) { - return Buf_Destroy(&buf->buf, free_buf); + return Buf_Destroy(&buf->buf, free_buf); } -/* This callback for ModifyWords gets a single word from a variable expression +/* + * This callback for ModifyWords gets a single word from a variable expression * and typically adds a modification of this word to the buffer. It may also * do nothing or add several words. * * For example, in ${:Ua b c:M*2}, the callback is called 3 times, once for - * each word of "a b c". */ + * each word of "a b c". + */ typedef void (*ModifyWordsCallback)(const char *word, SepBuf *buf, void *data); -/* Callback for ModifyWords to implement the :H modifier. - * Add the dirname of the given word to the buffer. */ +/* + * Callback for ModifyWords to implement the :H modifier. + * Add the dirname of the given word to the buffer. + */ +/*ARGSUSED*/ static void ModifyWord_Head(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED) { - const char *slash = strrchr(word, '/'); - if (slash != NULL) - SepBuf_AddBytesBetween(buf, word, slash); - else - SepBuf_AddStr(buf, "."); + const char *slash = strrchr(word, '/'); + if (slash != NULL) + SepBuf_AddBytesBetween(buf, word, slash); + else + SepBuf_AddStr(buf, "."); } -/* Callback for ModifyWords to implement the :T modifier. - * Add the basename of the given word to the buffer. */ +/* + * Callback for ModifyWords to implement the :T modifier. + * Add the basename of the given word to the buffer. + */ +/*ARGSUSED*/ static void ModifyWord_Tail(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED) { - const char *slash = strrchr(word, '/'); - const char *base = slash != NULL ? slash + 1 : word; - SepBuf_AddStr(buf, base); + SepBuf_AddStr(buf, str_basename(word)); } -/* Callback for ModifyWords to implement the :E modifier. - * Add the filename suffix of the given word to the buffer, if it exists. */ +/* + * Callback for ModifyWords to implement the :E modifier. + * Add the filename suffix of the given word to the buffer, if it exists. + */ +/*ARGSUSED*/ static void ModifyWord_Suffix(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED) { - const char *dot = strrchr(word, '.'); - if (dot != NULL) - SepBuf_AddStr(buf, dot + 1); + const char *lastDot = strrchr(word, '.'); + if (lastDot != NULL) + SepBuf_AddStr(buf, lastDot + 1); } -/* Callback for ModifyWords to implement the :R modifier. - * Add the basename of the given word to the buffer. */ +/* + * Callback for ModifyWords to implement the :R modifier. + * Add the basename of the given word to the buffer. + */ +/*ARGSUSED*/ static void ModifyWord_Root(const char *word, SepBuf *buf, void *dummy MAKE_ATTR_UNUSED) { - const char *dot = strrchr(word, '.'); - size_t len = dot != NULL ? (size_t)(dot - word) : strlen(word); - SepBuf_AddBytes(buf, word, len); + const char *lastDot = strrchr(word, '.'); + size_t len = lastDot != NULL ? (size_t)(lastDot - word) : strlen(word); + SepBuf_AddBytes(buf, word, len); } -/* Callback for ModifyWords to implement the :M modifier. - * Place the word in the buffer if it matches the given pattern. */ +/* + * Callback for ModifyWords to implement the :M modifier. + * Place the word in the buffer if it matches the given pattern. + */ static void ModifyWord_Match(const char *word, SepBuf *buf, void *data) { - const char *pattern = data; - VAR_DEBUG2("VarMatch [%s] [%s]\n", word, pattern); - if (Str_Match(word, pattern)) - SepBuf_AddStr(buf, word); + const char *pattern = data; + DEBUG2(VAR, "VarMatch [%s] [%s]\n", word, pattern); + if (Str_Match(word, pattern)) + SepBuf_AddStr(buf, word); } -/* Callback for ModifyWords to implement the :N modifier. - * Place the word in the buffer if it doesn't match the given pattern. */ +/* + * Callback for ModifyWords to implement the :N modifier. + * Place the word in the buffer if it doesn't match the given pattern. + */ static void ModifyWord_NoMatch(const char *word, SepBuf *buf, void *data) { - const char *pattern = data; - if (!Str_Match(word, pattern)) - SepBuf_AddStr(buf, word); + const char *pattern = data; + if (!Str_Match(word, pattern)) + SepBuf_AddStr(buf, word); } #ifdef SYSVVARSUB -/* Check word against pattern for a match (% is a wildcard). + +/* + * Check word against pattern for a match (% is a wildcard). * * Input: * word Word to examine * pattern Pattern to examine against * * Results: * Returns the start of the match, or NULL. * out_match_len returns the length of the match, if any. * out_hasPercent returns whether the pattern contains a percent. */ static const char * SysVMatch(const char *word, const char *pattern, - size_t *out_match_len, Boolean *out_hasPercent) + size_t *out_match_len, Boolean *out_hasPercent) { - const char *p = pattern; - const char *w = word; - const char *percent; - size_t w_len; - size_t p_len; - const char *w_tail; - - *out_hasPercent = FALSE; - percent = strchr(p, '%'); - if (percent != NULL) { /* ${VAR:...%...=...} */ - *out_hasPercent = TRUE; - if (*w == '\0') - return NULL; /* empty word does not match pattern */ - - /* check that the prefix matches */ - for (; p != percent && *w != '\0' && *w == *p; w++, p++) - continue; - if (p != percent) - return NULL; /* No match */ - - p++; /* Skip the percent */ - if (*p == '\0') { - /* No more pattern, return the rest of the string */ - *out_match_len = strlen(w); - return w; + const char *p = pattern; + const char *w = word; + const char *percent; + size_t w_len; + size_t p_len; + const char *w_tail; + + *out_hasPercent = FALSE; + percent = strchr(p, '%'); + if (percent != NULL) { /* ${VAR:...%...=...} */ + *out_hasPercent = TRUE; + if (w[0] == '\0') + return NULL; /* empty word does not match pattern */ + + /* check that the prefix matches */ + for (; p != percent && *w != '\0' && *w == *p; w++, p++) + continue; + if (p != percent) + return NULL; /* No match */ + + p++; /* Skip the percent */ + if (*p == '\0') { + /* No more pattern, return the rest of the string */ + *out_match_len = strlen(w); + return w; + } } - } - /* Test whether the tail matches */ - w_len = strlen(w); - p_len = strlen(p); - if (w_len < p_len) - return NULL; + /* Test whether the tail matches */ + w_len = strlen(w); + p_len = strlen(p); + if (w_len < p_len) + return NULL; - w_tail = w + w_len - p_len; - if (memcmp(p, w_tail, p_len) != 0) - return NULL; + w_tail = w + w_len - p_len; + if (memcmp(p, w_tail, p_len) != 0) + return NULL; - *out_match_len = (size_t)(w_tail - w); - return w; + *out_match_len = (size_t)(w_tail - w); + return w; } struct ModifyWord_SYSVSubstArgs { - GNode *ctx; - const char *lhs; - const char *rhs; + GNode *ctx; + const char *lhs; + const char *rhs; }; /* Callback for ModifyWords to implement the :%.from=%.to modifier. */ static void ModifyWord_SYSVSubst(const char *word, SepBuf *buf, void *data) { - const struct ModifyWord_SYSVSubstArgs *args = data; - char *rhs_expanded; - const char *rhs; - const char *percent; - - size_t match_len; - Boolean lhsPercent; - const char *match = SysVMatch(word, args->lhs, &match_len, &lhsPercent); - if (match == NULL) { - SepBuf_AddStr(buf, word); - return; - } + const struct ModifyWord_SYSVSubstArgs *args = data; + char *rhs_expanded; + const char *rhs; + const char *percent; + + size_t match_len; + Boolean lhsPercent; + const char *match = SysVMatch(word, args->lhs, &match_len, &lhsPercent); + if (match == NULL) { + SepBuf_AddStr(buf, word); + return; + } - /* Append rhs to the buffer, substituting the first '%' with the - * match, but only if the lhs had a '%' as well. */ + /* + * Append rhs to the buffer, substituting the first '%' with the + * match, but only if the lhs had a '%' as well. + */ - (void)Var_Subst(args->rhs, args->ctx, VARE_WANTRES, &rhs_expanded); - /* TODO: handle errors */ + (void)Var_Subst(args->rhs, args->ctx, VARE_WANTRES, &rhs_expanded); + /* TODO: handle errors */ - rhs = rhs_expanded; - percent = strchr(rhs, '%'); + rhs = rhs_expanded; + percent = strchr(rhs, '%'); - if (percent != NULL && lhsPercent) { - /* Copy the prefix of the replacement pattern */ - SepBuf_AddBytesBetween(buf, rhs, percent); - rhs = percent + 1; - } - if (percent != NULL || !lhsPercent) - SepBuf_AddBytes(buf, match, match_len); + if (percent != NULL && lhsPercent) { + /* Copy the prefix of the replacement pattern */ + SepBuf_AddBytesBetween(buf, rhs, percent); + rhs = percent + 1; + } + if (percent != NULL || !lhsPercent) + SepBuf_AddBytes(buf, match, match_len); - /* Append the suffix of the replacement pattern */ - SepBuf_AddStr(buf, rhs); + /* Append the suffix of the replacement pattern */ + SepBuf_AddStr(buf, rhs); - free(rhs_expanded); + free(rhs_expanded); } #endif struct ModifyWord_SubstArgs { - const char *lhs; - size_t lhsLen; - const char *rhs; - size_t rhsLen; - VarPatternFlags pflags; - Boolean matched; + const char *lhs; + size_t lhsLen; + const char *rhs; + size_t rhsLen; + VarPatternFlags pflags; + Boolean matched; }; -/* Callback for ModifyWords to implement the :S,from,to, modifier. - * Perform a string substitution on the given word. */ +/* + * Callback for ModifyWords to implement the :S,from,to, modifier. + * Perform a string substitution on the given word. + */ static void ModifyWord_Subst(const char *word, SepBuf *buf, void *data) { - size_t wordLen = strlen(word); - struct ModifyWord_SubstArgs *args = data; - const char *match; - - if ((args->pflags & VARP_SUB_ONE) && args->matched) - goto nosub; - - if (args->pflags & VARP_ANCHOR_START) { - if (wordLen < args->lhsLen || - memcmp(word, args->lhs, args->lhsLen) != 0) - goto nosub; - - if ((args->pflags & VARP_ANCHOR_END) && wordLen != args->lhsLen) - goto nosub; - - /* :S,^prefix,replacement, or :S,^whole$,replacement, */ - SepBuf_AddBytes(buf, args->rhs, args->rhsLen); - SepBuf_AddBytes(buf, word + args->lhsLen, wordLen - args->lhsLen); - args->matched = TRUE; - return; - } - - if (args->pflags & VARP_ANCHOR_END) { - const char *start; - - if (wordLen < args->lhsLen) - goto nosub; - - start = word + (wordLen - args->lhsLen); - if (memcmp(start, args->lhs, args->lhsLen) != 0) - goto nosub; - - /* :S,suffix$,replacement, */ - SepBuf_AddBytesBetween(buf, word, start); - SepBuf_AddBytes(buf, args->rhs, args->rhsLen); - args->matched = TRUE; - return; - } - - if (args->lhs[0] == '\0') - goto nosub; - - /* unanchored case, may match more than once */ - while ((match = strstr(word, args->lhs)) != NULL) { - SepBuf_AddBytesBetween(buf, word, match); - SepBuf_AddBytes(buf, args->rhs, args->rhsLen); - args->matched = TRUE; - wordLen -= (size_t)(match - word) + args->lhsLen; - word += (size_t)(match - word) + args->lhsLen; - if (wordLen == 0 || !(args->pflags & VARP_SUB_GLOBAL)) - break; - } + size_t wordLen = strlen(word); + struct ModifyWord_SubstArgs *args = data; + const char *match; + + if ((args->pflags & VARP_SUB_ONE) && args->matched) + goto nosub; + + if (args->pflags & VARP_ANCHOR_START) { + if (wordLen < args->lhsLen || + memcmp(word, args->lhs, args->lhsLen) != 0) + goto nosub; + + if ((args->pflags & VARP_ANCHOR_END) && wordLen != args->lhsLen) + goto nosub; + + /* :S,^prefix,replacement, or :S,^whole$,replacement, */ + SepBuf_AddBytes(buf, args->rhs, args->rhsLen); + SepBuf_AddBytes(buf, word + args->lhsLen, + wordLen - args->lhsLen); + args->matched = TRUE; + return; + } + + if (args->pflags & VARP_ANCHOR_END) { + const char *start; + + if (wordLen < args->lhsLen) + goto nosub; + + start = word + (wordLen - args->lhsLen); + if (memcmp(start, args->lhs, args->lhsLen) != 0) + goto nosub; + + /* :S,suffix$,replacement, */ + SepBuf_AddBytesBetween(buf, word, start); + SepBuf_AddBytes(buf, args->rhs, args->rhsLen); + args->matched = TRUE; + return; + } + + if (args->lhs[0] == '\0') + goto nosub; + + /* unanchored case, may match more than once */ + while ((match = strstr(word, args->lhs)) != NULL) { + SepBuf_AddBytesBetween(buf, word, match); + SepBuf_AddBytes(buf, args->rhs, args->rhsLen); + args->matched = TRUE; + wordLen -= (size_t)(match - word) + args->lhsLen; + word += (size_t)(match - word) + args->lhsLen; + if (wordLen == 0 || !(args->pflags & VARP_SUB_GLOBAL)) + break; + } nosub: - SepBuf_AddBytes(buf, word, wordLen); + SepBuf_AddBytes(buf, word, wordLen); } #ifndef NO_REGEX /* Print the error caused by a regcomp or regexec call. */ static void VarREError(int reerr, const regex_t *pat, const char *str) { - size_t errlen = regerror(reerr, pat, NULL, 0); - char *errbuf = bmake_malloc(errlen); - regerror(reerr, pat, errbuf, errlen); - Error("%s: %s", str, errbuf); - free(errbuf); + size_t errlen = regerror(reerr, pat, NULL, 0); + char *errbuf = bmake_malloc(errlen); + regerror(reerr, pat, errbuf, errlen); + Error("%s: %s", str, errbuf); + free(errbuf); } struct ModifyWord_SubstRegexArgs { - regex_t re; - size_t nsub; - char *replace; - VarPatternFlags pflags; - Boolean matched; + regex_t re; + size_t nsub; + char *replace; + VarPatternFlags pflags; + Boolean matched; }; -/* Callback for ModifyWords to implement the :C/from/to/ modifier. - * Perform a regex substitution on the given word. */ +/* + * Callback for ModifyWords to implement the :C/from/to/ modifier. + * Perform a regex substitution on the given word. + */ static void ModifyWord_SubstRegex(const char *word, SepBuf *buf, void *data) { - struct ModifyWord_SubstRegexArgs *args = data; - int xrv; - const char *wp = word; - char *rp; - int flags = 0; - regmatch_t m[10]; + struct ModifyWord_SubstRegexArgs *args = data; + int xrv; + const char *wp = word; + char *rp; + int flags = 0; + regmatch_t m[10]; - if ((args->pflags & VARP_SUB_ONE) && args->matched) - goto nosub; + if ((args->pflags & VARP_SUB_ONE) && args->matched) + goto nosub; tryagain: - xrv = regexec(&args->re, wp, args->nsub, m, flags); - - switch (xrv) { - case 0: - args->matched = TRUE; - SepBuf_AddBytes(buf, wp, (size_t)m[0].rm_so); - - for (rp = args->replace; *rp; rp++) { - if (*rp == '\\' && (rp[1] == '&' || rp[1] == '\\')) { - SepBuf_AddBytes(buf, rp + 1, 1); - rp++; - continue; - } - - if (*rp == '&') { - SepBuf_AddBytesBetween(buf, wp + m[0].rm_so, wp + m[0].rm_eo); - continue; - } - - if (*rp != '\\' || !ch_isdigit(rp[1])) { - SepBuf_AddBytes(buf, rp, 1); - continue; - } - - { /* \0 to \9 backreference */ - size_t n = (size_t)(rp[1] - '0'); - rp++; - - if (n >= args->nsub) { - Error("No subexpression \\%zu", n); - } else if (m[n].rm_so == -1) { - Error("No match for subexpression \\%zu", n); - } else { - SepBuf_AddBytesBetween(buf, wp + m[n].rm_so, - wp + m[n].rm_eo); + xrv = regexec(&args->re, wp, args->nsub, m, flags); + + switch (xrv) { + case 0: + args->matched = TRUE; + SepBuf_AddBytes(buf, wp, (size_t)m[0].rm_so); + + for (rp = args->replace; *rp != '\0'; rp++) { + if (*rp == '\\' && (rp[1] == '&' || rp[1] == '\\')) { + SepBuf_AddBytes(buf, rp + 1, 1); + rp++; + continue; + } + + if (*rp == '&') { + SepBuf_AddBytesBetween(buf, + wp + m[0].rm_so, wp + m[0].rm_eo); + continue; + } + + if (*rp != '\\' || !ch_isdigit(rp[1])) { + SepBuf_AddBytes(buf, rp, 1); + continue; + } + + { /* \0 to \9 backreference */ + size_t n = (size_t)(rp[1] - '0'); + rp++; + + if (n >= args->nsub) { + Error("No subexpression \\%u", + (unsigned)n); + } else if (m[n].rm_so == -1) { + Error( + "No match for subexpression \\%u", + (unsigned)n); + } else { + SepBuf_AddBytesBetween(buf, + wp + m[n].rm_so, wp + m[n].rm_eo); + } + } } - } - } - wp += m[0].rm_eo; - if (args->pflags & VARP_SUB_GLOBAL) { - flags |= REG_NOTBOL; - if (m[0].rm_so == 0 && m[0].rm_eo == 0) { - SepBuf_AddBytes(buf, wp, 1); - wp++; - } - if (*wp) - goto tryagain; - } - if (*wp) { - SepBuf_AddStr(buf, wp); + wp += m[0].rm_eo; + if (args->pflags & VARP_SUB_GLOBAL) { + flags |= REG_NOTBOL; + if (m[0].rm_so == 0 && m[0].rm_eo == 0) { + SepBuf_AddBytes(buf, wp, 1); + wp++; + } + if (*wp != '\0') + goto tryagain; + } + if (*wp != '\0') + SepBuf_AddStr(buf, wp); + break; + default: + VarREError(xrv, &args->re, "Unexpected regex error"); + /* FALLTHROUGH */ + case REG_NOMATCH: + nosub: + SepBuf_AddStr(buf, wp); + break; } - break; - default: - VarREError(xrv, &args->re, "Unexpected regex error"); - /* FALLTHROUGH */ - case REG_NOMATCH: - nosub: - SepBuf_AddStr(buf, wp); - break; - } } #endif struct ModifyWord_LoopArgs { - GNode *ctx; - char *tvar; /* name of temporary variable */ - char *str; /* string to expand */ - VarEvalFlags eflags; + GNode *ctx; + char *tvar; /* name of temporary variable */ + char *str; /* string to expand */ + VarEvalFlags eflags; }; /* Callback for ModifyWords to implement the :@var@...@ modifier of ODE make. */ static void ModifyWord_Loop(const char *word, SepBuf *buf, void *data) { - const struct ModifyWord_LoopArgs *args; - char *s; + const struct ModifyWord_LoopArgs *args; + char *s; - if (word[0] == '\0') - return; + if (word[0] == '\0') + return; - args = data; - Var_SetWithFlags(args->tvar, word, args->ctx, VAR_SET_NO_EXPORT); - (void)Var_Subst(args->str, args->ctx, args->eflags, &s); - /* TODO: handle errors */ + args = data; + Var_SetWithFlags(args->tvar, word, args->ctx, VAR_SET_NO_EXPORT); + (void)Var_Subst(args->str, args->ctx, args->eflags, &s); + /* TODO: handle errors */ - VAR_DEBUG4("ModifyWord_Loop: " - "in \"%s\", replace \"%s\" with \"%s\" to \"%s\"\n", - word, args->tvar, args->str, s); + DEBUG4(VAR, "ModifyWord_Loop: " + "in \"%s\", replace \"%s\" with \"%s\" to \"%s\"\n", + word, args->tvar, args->str, s); - if (s[0] == '\n' || Buf_EndsWith(&buf->buf, '\n')) - buf->needSep = FALSE; - SepBuf_AddStr(buf, s); - free(s); + if (s[0] == '\n' || Buf_EndsWith(&buf->buf, '\n')) + buf->needSep = FALSE; + SepBuf_AddStr(buf, s); + free(s); } -/* The :[first..last] modifier selects words from the expression. - * It can also reverse the words. */ +/* + * The :[first..last] modifier selects words from the expression. + * It can also reverse the words. + */ static char * VarSelectWords(char sep, Boolean oneBigWord, const char *str, int first, int last) { - Words words; - int len, start, end, step; - int i; - - SepBuf buf; - SepBuf_Init(&buf, sep); - - if (oneBigWord) { - /* fake what Str_Words() would do if there were only one word */ - words.len = 1; - words.words = bmake_malloc((words.len + 1) * sizeof(words.words[0])); - words.freeIt = bmake_strdup(str); - words.words[0] = words.freeIt; - words.words[1] = NULL; - } else { - words = Str_Words(str, FALSE); - } - - /* - * Now sanitize the given range. - * If first or last are negative, convert them to the positive equivalents - * (-1 gets converted to ac, -2 gets converted to (ac - 1), etc.). - */ - len = (int)words.len; - if (first < 0) - first += len + 1; - if (last < 0) - last += len + 1; - - /* - * We avoid scanning more of the list than we need to. - */ - if (first > last) { - start = (first > len ? len : first) - 1; - end = last < 1 ? 0 : last - 1; - step = -1; - } else { - start = first < 1 ? 0 : first - 1; - end = last > len ? len : last; - step = 1; - } - - for (i = start; (step < 0) == (i >= end); i += step) { - SepBuf_AddStr(&buf, words.words[i]); - SepBuf_Sep(&buf); - } - - Words_Free(words); - - return SepBuf_Destroy(&buf, FALSE); + Words words; + int len, start, end, step; + int i; + + SepBuf buf; + SepBuf_Init(&buf, sep); + + if (oneBigWord) { + /* fake what Str_Words() would do if there were only one word */ + words.len = 1; + words.words = bmake_malloc( + (words.len + 1) * sizeof(words.words[0])); + words.freeIt = bmake_strdup(str); + words.words[0] = words.freeIt; + words.words[1] = NULL; + } else { + words = Str_Words(str, FALSE); + } + + /* + * Now sanitize the given range. If first or last are negative, + * convert them to the positive equivalents (-1 gets converted to len, + * -2 gets converted to (len - 1), etc.). + */ + len = (int)words.len; + if (first < 0) + first += len + 1; + if (last < 0) + last += len + 1; + + /* We avoid scanning more of the list than we need to. */ + if (first > last) { + start = (first > len ? len : first) - 1; + end = last < 1 ? 0 : last - 1; + step = -1; + } else { + start = first < 1 ? 0 : first - 1; + end = last > len ? len : last; + step = 1; + } + + for (i = start; (step < 0) == (i >= end); i += step) { + SepBuf_AddStr(&buf, words.words[i]); + SepBuf_Sep(&buf); + } + + Words_Free(words); + + return SepBuf_Destroy(&buf, FALSE); } -/* Callback for ModifyWords to implement the :tA modifier. - * Replace each word with the result of realpath() if successful. */ +/* + * Callback for ModifyWords to implement the :tA modifier. + * Replace each word with the result of realpath() if successful. + */ +/*ARGSUSED*/ static void ModifyWord_Realpath(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED) { - struct stat st; - char rbuf[MAXPATHLEN]; + struct stat st; + char rbuf[MAXPATHLEN]; - const char *rp = cached_realpath(word, rbuf); - if (rp != NULL && *rp == '/' && stat(rp, &st) == 0) - word = rp; + const char *rp = cached_realpath(word, rbuf); + if (rp != NULL && *rp == '/' && stat(rp, &st) == 0) + word = rp; - SepBuf_AddStr(buf, word); + SepBuf_AddStr(buf, word); } -/* Modify each of the words of the passed string using the given function. +/* + * Modify each of the words of the passed string using the given function. * * Input: * str String whose words should be modified * modifyWord Function that modifies a single word * modifyWord_args Custom arguments for modifyWord * * Results: * A string of all the words modified appropriately. - *----------------------------------------------------------------------- */ static char * ModifyWords(const char *str, ModifyWordsCallback modifyWord, void *modifyWord_args, Boolean oneBigWord, char sep) { - SepBuf result; - Words words; - size_t i; + SepBuf result; + Words words; + size_t i; - if (oneBigWord) { - SepBuf_Init(&result, sep); - modifyWord(str, &result, modifyWord_args); - return SepBuf_Destroy(&result, FALSE); - } + if (oneBigWord) { + SepBuf_Init(&result, sep); + modifyWord(str, &result, modifyWord_args); + return SepBuf_Destroy(&result, FALSE); + } - SepBuf_Init(&result, sep); + SepBuf_Init(&result, sep); - words = Str_Words(str, FALSE); + words = Str_Words(str, FALSE); - VAR_DEBUG2("ModifyWords: split \"%s\" into %zu words\n", str, words.len); + DEBUG2(VAR, "ModifyWords: split \"%s\" into %u words\n", + str, (unsigned)words.len); - for (i = 0; i < words.len; i++) { - modifyWord(words.words[i], &result, modifyWord_args); - if (Buf_Len(&result.buf) > 0) - SepBuf_Sep(&result); - } + for (i = 0; i < words.len; i++) { + modifyWord(words.words[i], &result, modifyWord_args); + if (Buf_Len(&result.buf) > 0) + SepBuf_Sep(&result); + } - Words_Free(words); + Words_Free(words); - return SepBuf_Destroy(&result, FALSE); + return SepBuf_Destroy(&result, FALSE); } static char * Words_JoinFree(Words words) { - Buffer buf; - size_t i; + Buffer buf; + size_t i; - Buf_Init(&buf); + Buf_Init(&buf); - for (i = 0; i < words.len; i++) { - if (i != 0) - Buf_AddByte(&buf, ' '); /* XXX: st->sep, for consistency */ - Buf_AddStr(&buf, words.words[i]); - } + for (i = 0; i < words.len; i++) { + if (i != 0) { + /* XXX: Use st->sep instead of ' ', for consistency. */ + Buf_AddByte(&buf, ' '); + } + Buf_AddStr(&buf, words.words[i]); + } - Words_Free(words); + Words_Free(words); - return Buf_Destroy(&buf, FALSE); + return Buf_Destroy(&buf, FALSE); } /* Remove adjacent duplicate words. */ static char * VarUniq(const char *str) { - Words words = Str_Words(str, FALSE); - - if (words.len > 1) { - size_t i, j; - for (j = 0, i = 1; i < words.len; i++) - if (strcmp(words.words[i], words.words[j]) != 0 && (++j != i)) - words.words[j] = words.words[i]; - words.len = j + 1; - } + Words words = Str_Words(str, FALSE); + + if (words.len > 1) { + size_t i, j; + for (j = 0, i = 1; i < words.len; i++) + if (strcmp(words.words[i], words.words[j]) != 0 && + (++j != i)) + words.words[j] = words.words[i]; + words.len = j + 1; + } - return Words_JoinFree(words); + return Words_JoinFree(words); } -/* Quote shell meta-characters and space characters in the string. - * If quoteDollar is set, also quote and double any '$' characters. */ +/* + * Quote shell meta-characters and space characters in the string. + * If quoteDollar is set, also quote and double any '$' characters. + */ static char * VarQuote(const char *str, Boolean quoteDollar) { - Buffer buf; - Buf_Init(&buf); - - for (; *str != '\0'; str++) { - if (*str == '\n') { - const char *newline = Shell_GetNewline(); - if (newline == NULL) - newline = "\\\n"; - Buf_AddStr(&buf, newline); - continue; + Buffer buf; + Buf_Init(&buf); + + for (; *str != '\0'; str++) { + if (*str == '\n') { + const char *newline = Shell_GetNewline(); + if (newline == NULL) + newline = "\\\n"; + Buf_AddStr(&buf, newline); + continue; + } + if (ch_isspace(*str) || is_shell_metachar((unsigned char)*str)) + Buf_AddByte(&buf, '\\'); + Buf_AddByte(&buf, *str); + if (quoteDollar && *str == '$') + Buf_AddStr(&buf, "\\$"); } - if (ch_isspace(*str) || is_shell_metachar((unsigned char)*str)) - Buf_AddByte(&buf, '\\'); - Buf_AddByte(&buf, *str); - if (quoteDollar && *str == '$') - Buf_AddStr(&buf, "\\$"); - } - - return Buf_Destroy(&buf, FALSE); + + return Buf_Destroy(&buf, FALSE); } -/* Compute the 32-bit hash of the given string, using the MurmurHash3 - * algorithm. Output is encoded as 8 hex digits, in Little Endian order. */ +/* + * Compute the 32-bit hash of the given string, using the MurmurHash3 + * algorithm. Output is encoded as 8 hex digits, in Little Endian order. + */ static char * VarHash(const char *str) { - static const char hexdigits[16] = "0123456789abcdef"; - const unsigned char *ustr = (const unsigned char *)str; + static const char hexdigits[16] = "0123456789abcdef"; + const unsigned char *ustr = (const unsigned char *)str; - uint32_t h = 0x971e137bU; - uint32_t c1 = 0x95543787U; - uint32_t c2 = 0x2ad7eb25U; - size_t len2 = strlen(str); + uint32_t h = 0x971e137bU; + uint32_t c1 = 0x95543787U; + uint32_t c2 = 0x2ad7eb25U; + size_t len2 = strlen(str); - char *buf; - size_t i; + char *buf; + size_t i; - size_t len; - for (len = len2; len; ) { - uint32_t k = 0; - switch (len) { - default: - k = ((uint32_t)ustr[3] << 24) | - ((uint32_t)ustr[2] << 16) | - ((uint32_t)ustr[1] << 8) | - (uint32_t)ustr[0]; - len -= 4; - ustr += 4; - break; - case 3: - k |= (uint32_t)ustr[2] << 16; - /* FALLTHROUGH */ - case 2: - k |= (uint32_t)ustr[1] << 8; - /* FALLTHROUGH */ - case 1: - k |= (uint32_t)ustr[0]; - len = 0; + size_t len; + for (len = len2; len != 0;) { + uint32_t k = 0; + switch (len) { + default: + k = ((uint32_t)ustr[3] << 24) | + ((uint32_t)ustr[2] << 16) | + ((uint32_t)ustr[1] << 8) | + (uint32_t)ustr[0]; + len -= 4; + ustr += 4; + break; + case 3: + k |= (uint32_t)ustr[2] << 16; + /* FALLTHROUGH */ + case 2: + k |= (uint32_t)ustr[1] << 8; + /* FALLTHROUGH */ + case 1: + k |= (uint32_t)ustr[0]; + len = 0; + } + c1 = c1 * 5 + 0x7b7d159cU; + c2 = c2 * 5 + 0x6bce6396U; + k *= c1; + k = (k << 11) ^ (k >> 21); + k *= c2; + h = (h << 13) ^ (h >> 19); + h = h * 5 + 0x52dce729U; + h ^= k; + } + h ^= (uint32_t)len2; + h *= 0x85ebca6b; + h ^= h >> 13; + h *= 0xc2b2ae35; + h ^= h >> 16; + + buf = bmake_malloc(9); + for (i = 0; i < 8; i++) { + buf[i] = hexdigits[h & 0x0f]; + h >>= 4; } - c1 = c1 * 5 + 0x7b7d159cU; - c2 = c2 * 5 + 0x6bce6396U; - k *= c1; - k = (k << 11) ^ (k >> 21); - k *= c2; - h = (h << 13) ^ (h >> 19); - h = h * 5 + 0x52dce729U; - h ^= k; - } - h ^= (uint32_t)len2; - h *= 0x85ebca6b; - h ^= h >> 13; - h *= 0xc2b2ae35; - h ^= h >> 16; - - buf = bmake_malloc(9); - for (i = 0; i < 8; i++) { - buf[i] = hexdigits[h & 0x0f]; - h >>= 4; - } - buf[8] = '\0'; - return buf; + buf[8] = '\0'; + return buf; } static char * VarStrftime(const char *fmt, Boolean zulu, time_t tim) { - char buf[BUFSIZ]; + char buf[BUFSIZ]; - if (tim == 0) - time(&tim); - if (*fmt == '\0') - fmt = "%c"; - strftime(buf, sizeof buf, fmt, zulu ? gmtime(&tim) : localtime(&tim)); + if (tim == 0) + time(&tim); + if (*fmt == '\0') + fmt = "%c"; + strftime(buf, sizeof buf, fmt, zulu ? gmtime(&tim) : localtime(&tim)); - buf[sizeof buf - 1] = '\0'; - return bmake_strdup(buf); + buf[sizeof buf - 1] = '\0'; + return bmake_strdup(buf); } /* * The ApplyModifier functions take an expression that is being evaluated. * Their task is to apply a single modifier to the expression. * To do this, they parse the modifier and its parameters from pp and apply * the parsed modifier to the current value of the expression, generating a * new value from it. * * The modifier typically lasts until the next ':', or a closing '}' or ')' * (taken from st->endc), or the end of the string (parse error). * * The high-level behavior of these functions is: * * 1. parse the modifier * 2. evaluate the modifier * 3. housekeeping * * Parsing the modifier * * If parsing succeeds, the parsing position *pp is updated to point to the * first character following the modifier, which typically is either ':' or * st->endc. The modifier doesn't have to check for this delimiter character, * this is done by ApplyModifiers. * * XXX: As of 2020-11-15, some modifiers such as :S, :C, :P, :L do not * need to be followed by a ':' or endc; this was an unintended mistake. * * If parsing fails because of a missing delimiter (as in the :S, :C or :@ * modifiers), return AMR_CLEANUP. * * If parsing fails because the modifier is unknown, return AMR_UNKNOWN to * try the SysV modifier ${VAR:from=to} as fallback. This should only be * done as long as there have been no side effects from evaluating nested * variables, to avoid evaluating them more than once. In this case, the * parsing position may or may not be updated. (XXX: Why not? The original * parsing position is well-known in ApplyModifiers.) * * If parsing fails and the SysV modifier ${VAR:from=to} should not be used * as a fallback, either issue an error message using Error or Parse_Error * and then return AMR_CLEANUP, or return AMR_BAD for the default error * message. Both of these return values will stop processing the variable * expression. (XXX: As of 2020-08-23, evaluation of the whole string * continues nevertheless after skipping a few bytes, which essentially is * undefined behavior. Not in the sense of C, but still it's impossible to * predict what happens in the parser.) * * Evaluating the modifier * * After parsing, the modifier is evaluated. The side effects from evaluating * nested variable expressions in the modifier text often already happen * during parsing though. * * Evaluating the modifier usually takes the current value of the variable * expression from st->val, or the variable name from st->var->name and stores * the result in st->newVal. * * If evaluating fails (as of 2020-08-23), an error message is printed using * Error. This function has no side-effects, it really just prints the error * message. Processing the expression continues as if everything were ok. * XXX: This should be fixed by adding proper error handling to Var_Subst, * Var_Parse, ApplyModifiers and ModifyWords. * * Housekeeping * * Some modifiers such as :D and :U turn undefined expressions into defined * expressions (see VEF_UNDEF, VEF_DEF). * * Some modifiers need to free some memory. */ typedef enum VarExprFlags { - /* The variable expression is based on an undefined variable. */ - VEF_UNDEF = 0x01, - /* The variable expression started as an undefined expression, but one - * of the modifiers (such as :D or :U) has turned the expression from - * undefined to defined. */ - VEF_DEF = 0x02 + VEF_NONE = 0, + /* The variable expression is based on an undefined variable. */ + VEF_UNDEF = 0x01, + /* + * The variable expression started as an undefined expression, but one + * of the modifiers (such as :D or :U) has turned the expression from + * undefined to defined. + */ + VEF_DEF = 0x02 } VarExprFlags; ENUM_FLAGS_RTTI_2(VarExprFlags, VEF_UNDEF, VEF_DEF); typedef struct ApplyModifiersState { - const char startc; /* '\0' or '{' or '(' */ - const char endc; /* '\0' or '}' or ')' */ - Var * const var; - GNode * const ctxt; - const VarEvalFlags eflags; - - char *val; /* The old value of the expression, - * before applying the modifier, never NULL */ - char *newVal; /* The new value of the expression, - * after applying the modifier, never NULL */ - char sep; /* Word separator in expansions - * (see the :ts modifier) */ - Boolean oneBigWord; /* TRUE if some modifiers that otherwise split - * the variable value into words, like :S and - * :C, treat the variable value as a single big - * word, possibly containing spaces. */ - VarExprFlags exprFlags; + /* '\0' or '{' or '(' */ + const char startc; + /* '\0' or '}' or ')' */ + const char endc; + Var *const var; + GNode *const ctxt; + const VarEvalFlags eflags; + /* + * The new value of the expression, after applying the modifier, + * never NULL. + */ + FStr newVal; + /* Word separator in expansions (see the :ts modifier). */ + char sep; + /* + * TRUE if some modifiers that otherwise split the variable value + * into words, like :S and :C, treat the variable value as a single + * big word, possibly containing spaces. + */ + Boolean oneBigWord; + VarExprFlags exprFlags; } ApplyModifiersState; static void ApplyModifiersState_Define(ApplyModifiersState *st) { - if (st->exprFlags & VEF_UNDEF) - st->exprFlags |= VEF_DEF; + if (st->exprFlags & VEF_UNDEF) + st->exprFlags |= VEF_DEF; +} + +typedef enum ApplyModifierResult { + /* Continue parsing */ + AMR_OK, + /* Not a match, try other modifiers as well */ + AMR_UNKNOWN, + /* Error out with "Bad modifier" message */ + AMR_BAD, + /* Error out without error message */ + AMR_CLEANUP +} ApplyModifierResult; + +/* + * Allow backslashes to escape the delimiter, $, and \, but don't touch other + * backslashes. + */ +static Boolean +IsEscapedModifierPart(const char *p, char delim, + struct ModifyWord_SubstArgs *subst) +{ + if (p[0] != '\\') + return FALSE; + if (p[1] == delim || p[1] == '\\' || p[1] == '$') + return TRUE; + return p[1] == '&' && subst != NULL; } -typedef enum ApplyModifierResult { - AMR_OK, /* Continue parsing */ - AMR_UNKNOWN, /* Not a match, try other modifiers as well */ - AMR_BAD, /* Error out with "Bad modifier" message */ - AMR_CLEANUP /* Error out without error message */ -} ApplyModifierResult; +/* See ParseModifierPart */ +static VarParseResult +ParseModifierPartSubst( + const char **pp, + char delim, + VarEvalFlags eflags, + ApplyModifiersState *st, + char **out_part, + /* Optionally stores the length of the returned string, just to save + * another strlen call. */ + size_t *out_length, + /* For the first part of the :S modifier, sets the VARP_ANCHOR_END flag + * if the last character of the pattern is a $. */ + VarPatternFlags *out_pflags, + /* For the second part of the :S modifier, allow ampersands to be + * escaped and replace unescaped ampersands with subst->lhs. */ + struct ModifyWord_SubstArgs *subst +) +{ + Buffer buf; + const char *p; + + Buf_Init(&buf); + + /* + * Skim through until the matching delimiter is found; pick up + * variable expressions on the way. + */ + p = *pp; + while (*p != '\0' && *p != delim) { + const char *varstart; + + if (IsEscapedModifierPart(p, delim, subst)) { + Buf_AddByte(&buf, p[1]); + p += 2; + continue; + } + + if (*p != '$') { /* Unescaped, simple text */ + if (subst != NULL && *p == '&') + Buf_AddBytes(&buf, subst->lhs, subst->lhsLen); + else + Buf_AddByte(&buf, *p); + p++; + continue; + } + + if (p[1] == delim) { /* Unescaped $ at end of pattern */ + if (out_pflags != NULL) + *out_pflags |= VARP_ANCHOR_END; + else + Buf_AddByte(&buf, *p); + p++; + continue; + } + + if (eflags & VARE_WANTRES) { /* Nested variable, evaluated */ + const char *nested_p = p; + FStr nested_val; + VarEvalFlags nested_eflags = + eflags & ~(unsigned)VARE_KEEP_DOLLAR; + + (void)Var_Parse(&nested_p, st->ctxt, nested_eflags, + &nested_val); + /* TODO: handle errors */ + Buf_AddStr(&buf, nested_val.str); + FStr_Done(&nested_val); + p += nested_p - p; + continue; + } + + /* + * XXX: This whole block is very similar to Var_Parse without + * VARE_WANTRES. There may be subtle edge cases though that + * are not yet covered in the unit tests and that are parsed + * differently, depending on whether they are evaluated or + * not. + * + * This subtle difference is not documented in the manual + * page, neither is the difference between parsing :D and + * :M documented. No code should ever depend on these + * details, but who knows. + */ + + varstart = p; /* Nested variable, only parsed */ + if (p[1] == '(' || p[1] == '{') { + /* + * Find the end of this variable reference + * and suck it in without further ado. + * It will be interpreted later. + */ + char startc = p[1]; + int endc = startc == '(' ? ')' : '}'; + int depth = 1; + + for (p += 2; *p != '\0' && depth > 0; p++) { + if (p[-1] != '\\') { + if (*p == startc) + depth++; + if (*p == endc) + depth--; + } + } + Buf_AddBytesBetween(&buf, varstart, p); + } else { + Buf_AddByte(&buf, *varstart); + p++; + } + } + + if (*p != delim) { + *pp = p; + Error("Unfinished modifier for %s ('%c' missing)", + st->var->name.str, delim); + *out_part = NULL; + return VPR_ERR; + } + + *pp = ++p; + if (out_length != NULL) + *out_length = Buf_Len(&buf); -/* Allow backslashes to escape the delimiter, $, and \, but don't touch other - * backslashes. */ -static Boolean -IsEscapedModifierPart(const char *p, char delim, - struct ModifyWord_SubstArgs *subst) -{ - if (p[0] != '\\') - return FALSE; - if (p[1] == delim || p[1] == '\\' || p[1] == '$') - return TRUE; - return p[1] == '&' && subst != NULL; + *out_part = Buf_Destroy(&buf, FALSE); + DEBUG1(VAR, "Modifier part: \"%s\"\n", *out_part); + return VPR_OK; } /* * Parse a part of a modifier such as the "from" and "to" in :S/from/to/ or * the "var" or "replacement ${var}" in :@var@replacement ${var}@, up to and * including the next unescaped delimiter. The delimiter, as well as the * backslash or the dollar, can be escaped with a backslash. * * Return the parsed (and possibly expanded) string, or NULL if no delimiter * was found. On successful return, the parsing position pp points right * after the delimiter. The delimiter is not included in the returned * value though. */ static VarParseResult ParseModifierPart( - const char **pp, /* The parsing position, updated upon return */ - char delim, /* Parsing stops at this delimiter */ - VarEvalFlags eflags, /* Flags for evaluating nested variables; - * if VARE_WANTRES is not set, the text is - * only parsed */ + /* The parsing position, updated upon return */ + const char **pp, + /* Parsing stops at this delimiter */ + char delim, + /* Flags for evaluating nested variables; if VARE_WANTRES is not set, + * the text is only parsed. */ + VarEvalFlags eflags, ApplyModifiersState *st, - char **out_part, - size_t *out_length, /* Optionally stores the length of the returned - * string, just to save another strlen call. */ - VarPatternFlags *out_pflags,/* For the first part of the :S modifier, - * sets the VARP_ANCHOR_END flag if the last - * character of the pattern is a $. */ - struct ModifyWord_SubstArgs *subst - /* For the second part of the :S modifier, - * allow ampersands to be escaped and replace - * unescaped ampersands with subst->lhs. */ -) { - Buffer buf; - const char *p; - - Buf_Init(&buf); - - /* - * Skim through until the matching delimiter is found; pick up variable - * expressions on the way. - */ - p = *pp; - while (*p != '\0' && *p != delim) { - const char *varstart; - - if (IsEscapedModifierPart(p, delim, subst)) { - Buf_AddByte(&buf, p[1]); - p += 2; - continue; - } - - if (*p != '$') { /* Unescaped, simple text */ - if (subst != NULL && *p == '&') - Buf_AddBytes(&buf, subst->lhs, subst->lhsLen); - else - Buf_AddByte(&buf, *p); - p++; - continue; - } - - if (p[1] == delim) { /* Unescaped $ at end of pattern */ - if (out_pflags != NULL) - *out_pflags |= VARP_ANCHOR_END; - else - Buf_AddByte(&buf, *p); - p++; - continue; - } - - if (eflags & VARE_WANTRES) { /* Nested variable, evaluated */ - const char *nested_p = p; - const char *nested_val; - void *nested_val_freeIt; - VarEvalFlags nested_eflags = eflags & ~(unsigned)VARE_KEEP_DOLLAR; - - (void)Var_Parse(&nested_p, st->ctxt, nested_eflags, - &nested_val, &nested_val_freeIt); - /* TODO: handle errors */ - Buf_AddStr(&buf, nested_val); - free(nested_val_freeIt); - p += nested_p - p; - continue; - } - - /* XXX: This whole block is very similar to Var_Parse without - * VARE_WANTRES. There may be subtle edge cases though that are - * not yet covered in the unit tests and that are parsed differently, - * depending on whether they are evaluated or not. - * - * This subtle difference is not documented in the manual page, - * neither is the difference between parsing :D and :M documented. - * No code should ever depend on these details, but who knows. */ - - varstart = p; /* Nested variable, only parsed */ - if (p[1] == '(' || p[1] == '{') { - /* - * Find the end of this variable reference - * and suck it in without further ado. - * It will be interpreted later. - */ - char startc = p[1]; - int endc = startc == '(' ? ')' : '}'; - int depth = 1; - - for (p += 2; *p != '\0' && depth > 0; p++) { - if (p[-1] != '\\') { - if (*p == startc) - depth++; - if (*p == endc) - depth--; - } - } - Buf_AddBytesBetween(&buf, varstart, p); - } else { - Buf_AddByte(&buf, *varstart); - p++; - } - } - - if (*p != delim) { - *pp = p; - Error("Unfinished modifier for %s ('%c' missing)", - st->var->name, delim); - *out_part = NULL; - return VPR_PARSE_MSG; - } - - *pp = ++p; - if (out_length != NULL) - *out_length = Buf_Len(&buf); - - *out_part = Buf_Destroy(&buf, FALSE); - VAR_DEBUG1("Modifier part: \"%s\"\n", *out_part); - return VPR_OK; + char **out_part +) +{ + return ParseModifierPartSubst(pp, delim, eflags, st, out_part, + NULL, NULL, NULL); } /* Test whether mod starts with modname, followed by a delimiter. */ MAKE_INLINE Boolean ModMatch(const char *mod, const char *modname, char endc) { - size_t n = strlen(modname); - return strncmp(mod, modname, n) == 0 && - (mod[n] == endc || mod[n] == ':'); + size_t n = strlen(modname); + return strncmp(mod, modname, n) == 0 && + (mod[n] == endc || mod[n] == ':'); } /* Test whether mod starts with modname, followed by a delimiter or '='. */ MAKE_INLINE Boolean ModMatchEq(const char *mod, const char *modname, char endc) { - size_t n = strlen(modname); - return strncmp(mod, modname, n) == 0 && - (mod[n] == endc || mod[n] == ':' || mod[n] == '='); + size_t n = strlen(modname); + return strncmp(mod, modname, n) == 0 && + (mod[n] == endc || mod[n] == ':' || mod[n] == '='); } static Boolean TryParseIntBase0(const char **pp, int *out_num) { - char *end; - long n; - - errno = 0; - n = strtol(*pp, &end, 0); - if ((n == LONG_MIN || n == LONG_MAX) && errno == ERANGE) - return FALSE; - if (n < INT_MIN || n > INT_MAX) - return FALSE; - - *pp = end; - *out_num = (int)n; - return TRUE; + char *end; + long n; + + errno = 0; + n = strtol(*pp, &end, 0); + if ((n == LONG_MIN || n == LONG_MAX) && errno == ERANGE) + return FALSE; + if (n < INT_MIN || n > INT_MAX) + return FALSE; + + *pp = end; + *out_num = (int)n; + return TRUE; } static Boolean TryParseSize(const char **pp, size_t *out_num) { - char *end; - unsigned long n; + char *end; + unsigned long n; - if (!ch_isdigit(**pp)) - return FALSE; + if (!ch_isdigit(**pp)) + return FALSE; - errno = 0; - n = strtoul(*pp, &end, 10); - if (n == ULONG_MAX && errno == ERANGE) - return FALSE; - if (n > SIZE_MAX) - return FALSE; + errno = 0; + n = strtoul(*pp, &end, 10); + if (n == ULONG_MAX && errno == ERANGE) + return FALSE; + if (n > SIZE_MAX) + return FALSE; - *pp = end; - *out_num = (size_t)n; - return TRUE; + *pp = end; + *out_num = (size_t)n; + return TRUE; } static Boolean TryParseChar(const char **pp, int base, char *out_ch) { - char *end; - unsigned long n; + char *end; + unsigned long n; - if (!ch_isalnum(**pp)) - return FALSE; + if (!ch_isalnum(**pp)) + return FALSE; - errno = 0; - n = strtoul(*pp, &end, base); - if (n == ULONG_MAX && errno == ERANGE) - return FALSE; - if (n > UCHAR_MAX) - return FALSE; + errno = 0; + n = strtoul(*pp, &end, base); + if (n == ULONG_MAX && errno == ERANGE) + return FALSE; + if (n > UCHAR_MAX) + return FALSE; - *pp = end; - *out_ch = (char)n; - return TRUE; + *pp = end; + *out_ch = (char)n; + return TRUE; } /* :@var@...${var}...@ */ static ApplyModifierResult -ApplyModifier_Loop(const char **pp, ApplyModifiersState *st) +ApplyModifier_Loop(const char **pp, const char *val, ApplyModifiersState *st) { - struct ModifyWord_LoopArgs args; - char prev_sep; - VarParseResult res; - - args.ctx = st->ctxt; - - (*pp)++; /* Skip the first '@' */ - res = ParseModifierPart(pp, '@', VARE_NONE, st, - &args.tvar, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - if (opts.lint && strchr(args.tvar, '$') != NULL) { - Parse_Error(PARSE_FATAL, + struct ModifyWord_LoopArgs args; + char prev_sep; + VarParseResult res; + + args.ctx = st->ctxt; + + (*pp)++; /* Skip the first '@' */ + res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.tvar); + if (res != VPR_OK) + return AMR_CLEANUP; + if (opts.strict && strchr(args.tvar, '$') != NULL) { + Parse_Error(PARSE_FATAL, "In the :@ modifier of \"%s\", the variable name \"%s\" " "must not contain a dollar.", - st->var->name, args.tvar); - return AMR_CLEANUP; - } - - res = ParseModifierPart(pp, '@', VARE_NONE, st, - &args.str, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - - args.eflags = st->eflags & ~(unsigned)VARE_KEEP_DOLLAR; - prev_sep = st->sep; - st->sep = ' '; /* XXX: should be st->sep for consistency */ - st->newVal = ModifyWords(st->val, ModifyWord_Loop, &args, - st->oneBigWord, st->sep); - st->sep = prev_sep; - /* XXX: Consider restoring the previous variable instead of deleting. */ - Var_Delete(args.tvar, st->ctxt); - free(args.tvar); - free(args.str); - return AMR_OK; + st->var->name.str, args.tvar); + return AMR_CLEANUP; + } + + res = ParseModifierPart(pp, '@', VARE_NONE, st, &args.str); + if (res != VPR_OK) + return AMR_CLEANUP; + + args.eflags = st->eflags & ~(unsigned)VARE_KEEP_DOLLAR; + prev_sep = st->sep; + st->sep = ' '; /* XXX: should be st->sep for consistency */ + st->newVal = FStr_InitOwn( + ModifyWords(val, ModifyWord_Loop, &args, st->oneBigWord, st->sep)); + st->sep = prev_sep; + /* XXX: Consider restoring the previous variable instead of deleting. */ + Var_Delete(args.tvar, st->ctxt); + free(args.tvar); + free(args.str); + return AMR_OK; } /* :Ddefined or :Uundefined */ static ApplyModifierResult -ApplyModifier_Defined(const char **pp, ApplyModifiersState *st) +ApplyModifier_Defined(const char **pp, const char *val, ApplyModifiersState *st) { - Buffer buf; - const char *p; - - VarEvalFlags eflags = VARE_NONE; - if (st->eflags & VARE_WANTRES) - if ((**pp == 'D') == !(st->exprFlags & VEF_UNDEF)) - eflags = st->eflags; + Buffer buf; + const char *p; + + VarEvalFlags eflags = VARE_NONE; + if (st->eflags & VARE_WANTRES) + if ((**pp == 'D') == !(st->exprFlags & VEF_UNDEF)) + eflags = st->eflags; + + Buf_Init(&buf); + p = *pp + 1; + while (*p != st->endc && *p != ':' && *p != '\0') { + + /* XXX: This code is similar to the one in Var_Parse. + * See if the code can be merged. + * See also ApplyModifier_Match. */ + + /* Escaped delimiter or other special character */ + if (*p == '\\') { + char c = p[1]; + if (c == st->endc || c == ':' || c == '$' || + c == '\\') { + Buf_AddByte(&buf, c); + p += 2; + continue; + } + } - Buf_Init(&buf); - p = *pp + 1; - while (*p != st->endc && *p != ':' && *p != '\0') { + /* Nested variable expression */ + if (*p == '$') { + FStr nested_val; - /* XXX: This code is similar to the one in Var_Parse. - * See if the code can be merged. - * See also ApplyModifier_Match. */ + (void)Var_Parse(&p, st->ctxt, eflags, &nested_val); + /* TODO: handle errors */ + Buf_AddStr(&buf, nested_val.str); + FStr_Done(&nested_val); + continue; + } - /* Escaped delimiter or other special character */ - if (*p == '\\') { - char c = p[1]; - if (c == st->endc || c == ':' || c == '$' || c == '\\') { - Buf_AddByte(&buf, c); - p += 2; - continue; - } + /* Ordinary text */ + Buf_AddByte(&buf, *p); + p++; } + *pp = p; - /* Nested variable expression */ - if (*p == '$') { - const char *nested_val; - void *nested_val_freeIt; - - (void)Var_Parse(&p, st->ctxt, eflags, - &nested_val, &nested_val_freeIt); - /* TODO: handle errors */ - Buf_AddStr(&buf, nested_val); - free(nested_val_freeIt); - continue; - } + ApplyModifiersState_Define(st); - /* Ordinary text */ - Buf_AddByte(&buf, *p); - p++; - } - *pp = p; - - ApplyModifiersState_Define(st); - - if (eflags & VARE_WANTRES) { - st->newVal = Buf_Destroy(&buf, FALSE); - } else { - st->newVal = st->val; - Buf_Destroy(&buf, TRUE); - } - return AMR_OK; + if (eflags & VARE_WANTRES) { + st->newVal = FStr_InitOwn(Buf_Destroy(&buf, FALSE)); + } else { + st->newVal = FStr_InitRefer(val); + Buf_Destroy(&buf, TRUE); + } + return AMR_OK; } /* :L */ static ApplyModifierResult ApplyModifier_Literal(const char **pp, ApplyModifiersState *st) { - ApplyModifiersState_Define(st); - st->newVal = bmake_strdup(st->var->name); - (*pp)++; - return AMR_OK; + ApplyModifiersState_Define(st); + st->newVal = FStr_InitOwn(bmake_strdup(st->var->name.str)); + (*pp)++; + return AMR_OK; } static Boolean TryParseTime(const char **pp, time_t *out_time) { - char *end; - unsigned long n; + char *end; + unsigned long n; - if (!ch_isdigit(**pp)) - return FALSE; + if (!ch_isdigit(**pp)) + return FALSE; - errno = 0; - n = strtoul(*pp, &end, 10); - if (n == ULONG_MAX && errno == ERANGE) - return FALSE; + errno = 0; + n = strtoul(*pp, &end, 10); + if (n == ULONG_MAX && errno == ERANGE) + return FALSE; - *pp = end; - *out_time = (time_t)n; /* ignore possible truncation for now */ - return TRUE; + *pp = end; + *out_time = (time_t)n; /* ignore possible truncation for now */ + return TRUE; } /* :gmtime */ static ApplyModifierResult -ApplyModifier_Gmtime(const char **pp, ApplyModifiersState *st) +ApplyModifier_Gmtime(const char **pp, const char *val, ApplyModifiersState *st) { - time_t utc; - - const char *mod = *pp; - if (!ModMatchEq(mod, "gmtime", st->endc)) - return AMR_UNKNOWN; - - if (mod[6] == '=') { - const char *arg = mod + 7; - if (!TryParseTime(&arg, &utc)) { - Parse_Error(PARSE_FATAL, "Invalid time value: %s\n", mod + 7); - return AMR_CLEANUP; + time_t utc; + + const char *mod = *pp; + if (!ModMatchEq(mod, "gmtime", st->endc)) + return AMR_UNKNOWN; + + if (mod[6] == '=') { + const char *arg = mod + 7; + if (!TryParseTime(&arg, &utc)) { + Parse_Error(PARSE_FATAL, + "Invalid time value: %s", mod + 7); + return AMR_CLEANUP; + } + *pp = arg; + } else { + utc = 0; + *pp = mod + 6; } - *pp = arg; - } else { - utc = 0; - *pp = mod + 6; - } - st->newVal = VarStrftime(st->val, TRUE, utc); - return AMR_OK; + st->newVal = FStr_InitOwn(VarStrftime(val, TRUE, utc)); + return AMR_OK; } /* :localtime */ static ApplyModifierResult -ApplyModifier_Localtime(const char **pp, ApplyModifiersState *st) +ApplyModifier_Localtime(const char **pp, const char *val, + ApplyModifiersState *st) { - time_t utc; - - const char *mod = *pp; - if (!ModMatchEq(mod, "localtime", st->endc)) - return AMR_UNKNOWN; - - if (mod[9] == '=') { - const char *arg = mod + 10; - if (!TryParseTime(&arg, &utc)) { - Parse_Error(PARSE_FATAL, "Invalid time value: %s\n", mod + 10); - return AMR_CLEANUP; + time_t utc; + + const char *mod = *pp; + if (!ModMatchEq(mod, "localtime", st->endc)) + return AMR_UNKNOWN; + + if (mod[9] == '=') { + const char *arg = mod + 10; + if (!TryParseTime(&arg, &utc)) { + Parse_Error(PARSE_FATAL, + "Invalid time value: %s", mod + 10); + return AMR_CLEANUP; + } + *pp = arg; + } else { + utc = 0; + *pp = mod + 9; } - *pp = arg; - } else { - utc = 0; - *pp = mod + 9; - } - st->newVal = VarStrftime(st->val, FALSE, utc); - return AMR_OK; + st->newVal = FStr_InitOwn(VarStrftime(val, FALSE, utc)); + return AMR_OK; } /* :hash */ static ApplyModifierResult -ApplyModifier_Hash(const char **pp, ApplyModifiersState *st) +ApplyModifier_Hash(const char **pp, const char *val, ApplyModifiersState *st) { - if (!ModMatch(*pp, "hash", st->endc)) - return AMR_UNKNOWN; + if (!ModMatch(*pp, "hash", st->endc)) + return AMR_UNKNOWN; - st->newVal = VarHash(st->val); - *pp += 4; - return AMR_OK; + st->newVal = FStr_InitOwn(VarHash(val)); + *pp += 4; + return AMR_OK; } /* :P */ static ApplyModifierResult ApplyModifier_Path(const char **pp, ApplyModifiersState *st) { - GNode *gn; - char *path; - - ApplyModifiersState_Define(st); - - gn = Targ_FindNode(st->var->name); - if (gn == NULL || gn->type & OP_NOPATH) { - path = NULL; - } else if (gn->path != NULL) { - path = bmake_strdup(gn->path); - } else { - SearchPath *searchPath = Suff_FindPath(gn); - path = Dir_FindFile(st->var->name, searchPath); - } - if (path == NULL) - path = bmake_strdup(st->var->name); - st->newVal = path; - - (*pp)++; - return AMR_OK; + GNode *gn; + char *path; + + ApplyModifiersState_Define(st); + + gn = Targ_FindNode(st->var->name.str); + if (gn == NULL || gn->type & OP_NOPATH) { + path = NULL; + } else if (gn->path != NULL) { + path = bmake_strdup(gn->path); + } else { + SearchPath *searchPath = Suff_FindPath(gn); + path = Dir_FindFile(st->var->name.str, searchPath); + } + if (path == NULL) + path = bmake_strdup(st->var->name.str); + st->newVal = FStr_InitOwn(path); + + (*pp)++; + return AMR_OK; } /* :!cmd! */ static ApplyModifierResult ApplyModifier_ShellCommand(const char **pp, ApplyModifiersState *st) { - char *cmd; - const char *errfmt; - VarParseResult res; - - (*pp)++; - res = ParseModifierPart(pp, '!', st->eflags, st, - &cmd, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - - errfmt = NULL; - if (st->eflags & VARE_WANTRES) - st->newVal = Cmd_Exec(cmd, &errfmt); - else - st->newVal = bmake_strdup(""); - if (errfmt != NULL) - Error(errfmt, cmd); /* XXX: why still return AMR_OK? */ - free(cmd); - - ApplyModifiersState_Define(st); - return AMR_OK; + char *cmd; + const char *errfmt; + VarParseResult res; + + (*pp)++; + res = ParseModifierPart(pp, '!', st->eflags, st, &cmd); + if (res != VPR_OK) + return AMR_CLEANUP; + + errfmt = NULL; + if (st->eflags & VARE_WANTRES) + st->newVal = FStr_InitOwn(Cmd_Exec(cmd, &errfmt)); + else + st->newVal = FStr_InitRefer(""); + if (errfmt != NULL) + Error(errfmt, cmd); /* XXX: why still return AMR_OK? */ + free(cmd); + + ApplyModifiersState_Define(st); + return AMR_OK; } -/* The :range modifier generates an integer sequence as long as the words. - * The :range=7 modifier generates an integer sequence from 1 to 7. */ +/* + * The :range modifier generates an integer sequence as long as the words. + * The :range=7 modifier generates an integer sequence from 1 to 7. + */ static ApplyModifierResult -ApplyModifier_Range(const char **pp, ApplyModifiersState *st) +ApplyModifier_Range(const char **pp, const char *val, ApplyModifiersState *st) { - size_t n; - Buffer buf; - size_t i; - - const char *mod = *pp; - if (!ModMatchEq(mod, "range", st->endc)) - return AMR_UNKNOWN; - - if (mod[5] == '=') { - const char *p = mod + 6; - if (!TryParseSize(&p, &n)) { - Parse_Error(PARSE_FATAL, "Invalid number: %s\n", mod + 6); - return AMR_CLEANUP; + size_t n; + Buffer buf; + size_t i; + + const char *mod = *pp; + if (!ModMatchEq(mod, "range", st->endc)) + return AMR_UNKNOWN; + + if (mod[5] == '=') { + const char *p = mod + 6; + if (!TryParseSize(&p, &n)) { + Parse_Error(PARSE_FATAL, + "Invalid number: %s", mod + 6); + return AMR_CLEANUP; + } + *pp = p; + } else { + n = 0; + *pp = mod + 5; } - *pp = p; - } else { - n = 0; - *pp = mod + 5; - } - - if (n == 0) { - Words words = Str_Words(st->val, FALSE); - n = words.len; - Words_Free(words); - } - Buf_Init(&buf); + if (n == 0) { + Words words = Str_Words(val, FALSE); + n = words.len; + Words_Free(words); + } + + Buf_Init(&buf); - for (i = 0; i < n; i++) { - if (i != 0) - Buf_AddByte(&buf, ' '); /* XXX: st->sep, for consistency */ - Buf_AddInt(&buf, 1 + (int)i); - } + for (i = 0; i < n; i++) { + if (i != 0) { + /* XXX: Use st->sep instead of ' ', for consistency. */ + Buf_AddByte(&buf, ' '); + } + Buf_AddInt(&buf, 1 + (int)i); + } - st->newVal = Buf_Destroy(&buf, FALSE); - return AMR_OK; + st->newVal = FStr_InitOwn(Buf_Destroy(&buf, FALSE)); + return AMR_OK; } /* :Mpattern or :Npattern */ static ApplyModifierResult -ApplyModifier_Match(const char **pp, ApplyModifiersState *st) +ApplyModifier_Match(const char **pp, const char *val, ApplyModifiersState *st) { - const char *mod = *pp; - Boolean copy = FALSE; /* pattern should be, or has been, copied */ - Boolean needSubst = FALSE; - const char *endpat; - char *pattern; - ModifyWordsCallback callback; - - /* - * In the loop below, ignore ':' unless we are at (or back to) the - * original brace level. - * XXX: This will likely not work right if $() and ${} are intermixed. - */ - /* XXX: This code is similar to the one in Var_Parse. - * See if the code can be merged. - * See also ApplyModifier_Defined. */ - int nest = 0; - const char *p; - for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 0); p++) { - if (*p == '\\' && - (p[1] == ':' || p[1] == st->endc || p[1] == st->startc)) { - if (!needSubst) - copy = TRUE; - p++; - continue; + const char *mod = *pp; + Boolean copy = FALSE; /* pattern should be, or has been, copied */ + Boolean needSubst = FALSE; + const char *endpat; + char *pattern; + ModifyWordsCallback callback; + + /* + * In the loop below, ignore ':' unless we are at (or back to) the + * original brace level. + * XXX: This will likely not work right if $() and ${} are intermixed. + */ + /* XXX: This code is similar to the one in Var_Parse. + * See if the code can be merged. + * See also ApplyModifier_Defined. */ + int nest = 0; + const char *p; + for (p = mod + 1; *p != '\0' && !(*p == ':' && nest == 0); p++) { + if (*p == '\\' && + (p[1] == ':' || p[1] == st->endc || p[1] == st->startc)) { + if (!needSubst) + copy = TRUE; + p++; + continue; + } + if (*p == '$') + needSubst = TRUE; + if (*p == '(' || *p == '{') + nest++; + if (*p == ')' || *p == '}') { + nest--; + if (nest < 0) + break; + } } - if (*p == '$') - needSubst = TRUE; - if (*p == '(' || *p == '{') - nest++; - if (*p == ')' || *p == '}') { - nest--; - if (nest < 0) - break; + *pp = p; + endpat = p; + + if (copy) { + char *dst; + const char *src; + + /* Compress the \:'s out of the pattern. */ + pattern = bmake_malloc((size_t)(endpat - (mod + 1)) + 1); + dst = pattern; + src = mod + 1; + for (; src < endpat; src++, dst++) { + if (src[0] == '\\' && src + 1 < endpat && + /* XXX: st->startc is missing here; see above */ + (src[1] == ':' || src[1] == st->endc)) + src++; + *dst = *src; + } + *dst = '\0'; + } else { + pattern = bmake_strsedup(mod + 1, endpat); } - } - *pp = p; - endpat = p; - - if (copy) { - char *dst; - const char *src; - - /* Compress the \:'s out of the pattern. */ - pattern = bmake_malloc((size_t)(endpat - (mod + 1)) + 1); - dst = pattern; - src = mod + 1; - for (; src < endpat; src++, dst++) { - if (src[0] == '\\' && src + 1 < endpat && - /* XXX: st->startc is missing here; see above */ - (src[1] == ':' || src[1] == st->endc)) - src++; - *dst = *src; + + if (needSubst) { + char *old_pattern = pattern; + (void)Var_Subst(pattern, st->ctxt, st->eflags, &pattern); + /* TODO: handle errors */ + free(old_pattern); } - *dst = '\0'; - endpat = dst; - } else { - pattern = bmake_strsedup(mod + 1, endpat); - } - - if (needSubst) { - /* pattern contains embedded '$', so use Var_Subst to expand it. */ - char *old_pattern = pattern; - (void)Var_Subst(pattern, st->ctxt, st->eflags, &pattern); - /* TODO: handle errors */ - free(old_pattern); - } - VAR_DEBUG3("Pattern[%s] for [%s] is [%s]\n", - st->var->name, st->val, pattern); + DEBUG3(VAR, "Pattern[%s] for [%s] is [%s]\n", + st->var->name.str, val, pattern); - callback = mod[0] == 'M' ? ModifyWord_Match : ModifyWord_NoMatch; - st->newVal = ModifyWords(st->val, callback, pattern, - st->oneBigWord, st->sep); - free(pattern); - return AMR_OK; + callback = mod[0] == 'M' ? ModifyWord_Match : ModifyWord_NoMatch; + st->newVal = FStr_InitOwn(ModifyWords(val, callback, pattern, + st->oneBigWord, st->sep)); + free(pattern); + return AMR_OK; } /* :S,from,to, */ static ApplyModifierResult -ApplyModifier_Subst(const char **pp, ApplyModifiersState *st) +ApplyModifier_Subst(const char **pp, const char *val, ApplyModifiersState *st) { - struct ModifyWord_SubstArgs args; - char *lhs, *rhs; - Boolean oneBigWord; - VarParseResult res; - - char delim = (*pp)[1]; - if (delim == '\0') { - Error("Missing delimiter for :S modifier"); - (*pp)++; - return AMR_CLEANUP; - } + struct ModifyWord_SubstArgs args; + char *lhs, *rhs; + Boolean oneBigWord; + VarParseResult res; + + char delim = (*pp)[1]; + if (delim == '\0') { + Error("Missing delimiter for :S modifier"); + (*pp)++; + return AMR_CLEANUP; + } - *pp += 2; + *pp += 2; - args.pflags = 0; - args.matched = FALSE; + args.pflags = VARP_NONE; + args.matched = FALSE; - /* - * If pattern begins with '^', it is anchored to the - * start of the word -- skip over it and flag pattern. - */ - if (**pp == '^') { - args.pflags |= VARP_ANCHOR_START; - (*pp)++; - } - - res = ParseModifierPart(pp, delim, st->eflags, st, - &lhs, &args.lhsLen, &args.pflags, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - args.lhs = lhs; - - res = ParseModifierPart(pp, delim, st->eflags, st, - &rhs, &args.rhsLen, NULL, &args); - if (res != VPR_OK) - return AMR_CLEANUP; - args.rhs = rhs; - - oneBigWord = st->oneBigWord; - for (;; (*pp)++) { - switch (**pp) { - case 'g': - args.pflags |= VARP_SUB_GLOBAL; - continue; - case '1': - args.pflags |= VARP_SUB_ONE; - continue; - case 'W': - oneBigWord = TRUE; - continue; + /* + * If pattern begins with '^', it is anchored to the + * start of the word -- skip over it and flag pattern. + */ + if (**pp == '^') { + args.pflags |= VARP_ANCHOR_START; + (*pp)++; + } + + res = ParseModifierPartSubst(pp, delim, st->eflags, st, &lhs, + &args.lhsLen, &args.pflags, NULL); + if (res != VPR_OK) + return AMR_CLEANUP; + args.lhs = lhs; + + res = ParseModifierPartSubst(pp, delim, st->eflags, st, &rhs, + &args.rhsLen, NULL, &args); + if (res != VPR_OK) + return AMR_CLEANUP; + args.rhs = rhs; + + oneBigWord = st->oneBigWord; + for (;; (*pp)++) { + switch (**pp) { + case 'g': + args.pflags |= VARP_SUB_GLOBAL; + continue; + case '1': + args.pflags |= VARP_SUB_ONE; + continue; + case 'W': + oneBigWord = TRUE; + continue; + } + break; } - break; - } - st->newVal = ModifyWords(st->val, ModifyWord_Subst, &args, - oneBigWord, st->sep); + st->newVal = FStr_InitOwn(ModifyWords(val, ModifyWord_Subst, &args, + oneBigWord, st->sep)); - free(lhs); - free(rhs); - return AMR_OK; + free(lhs); + free(rhs); + return AMR_OK; } #ifndef NO_REGEX /* :C,from,to, */ static ApplyModifierResult -ApplyModifier_Regex(const char **pp, ApplyModifiersState *st) +ApplyModifier_Regex(const char **pp, const char *val, ApplyModifiersState *st) { - char *re; - struct ModifyWord_SubstRegexArgs args; - Boolean oneBigWord; - int error; - VarParseResult res; - - char delim = (*pp)[1]; - if (delim == '\0') { - Error("Missing delimiter for :C modifier"); - (*pp)++; - return AMR_CLEANUP; - } + char *re; + struct ModifyWord_SubstRegexArgs args; + Boolean oneBigWord; + int error; + VarParseResult res; - *pp += 2; + char delim = (*pp)[1]; + if (delim == '\0') { + Error("Missing delimiter for :C modifier"); + (*pp)++; + return AMR_CLEANUP; + } - res = ParseModifierPart(pp, delim, st->eflags, st, - &re, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; + *pp += 2; - res = ParseModifierPart(pp, delim, st->eflags, st, - &args.replace, NULL, NULL, NULL); - if (args.replace == NULL) { - free(re); - return AMR_CLEANUP; - } + res = ParseModifierPart(pp, delim, st->eflags, st, &re); + if (res != VPR_OK) + return AMR_CLEANUP; - args.pflags = 0; - args.matched = FALSE; - oneBigWord = st->oneBigWord; - for (;; (*pp)++) { - switch (**pp) { - case 'g': - args.pflags |= VARP_SUB_GLOBAL; - continue; - case '1': - args.pflags |= VARP_SUB_ONE; - continue; - case 'W': - oneBigWord = TRUE; - continue; + res = ParseModifierPart(pp, delim, st->eflags, st, &args.replace); + if (args.replace == NULL) { + free(re); + return AMR_CLEANUP; + } + + args.pflags = VARP_NONE; + args.matched = FALSE; + oneBigWord = st->oneBigWord; + for (;; (*pp)++) { + switch (**pp) { + case 'g': + args.pflags |= VARP_SUB_GLOBAL; + continue; + case '1': + args.pflags |= VARP_SUB_ONE; + continue; + case 'W': + oneBigWord = TRUE; + continue; + } + break; + } + + error = regcomp(&args.re, re, REG_EXTENDED); + free(re); + if (error != 0) { + VarREError(error, &args.re, "Regex compilation error"); + free(args.replace); + return AMR_CLEANUP; } - break; - } - error = regcomp(&args.re, re, REG_EXTENDED); - free(re); - if (error) { - VarREError(error, &args.re, "Regex compilation error"); + args.nsub = args.re.re_nsub + 1; + if (args.nsub > 10) + args.nsub = 10; + st->newVal = FStr_InitOwn( + ModifyWords(val, ModifyWord_SubstRegex, &args, + oneBigWord, st->sep)); + regfree(&args.re); free(args.replace); - return AMR_CLEANUP; - } - - args.nsub = args.re.re_nsub + 1; - if (args.nsub > 10) - args.nsub = 10; - st->newVal = ModifyWords(st->val, ModifyWord_SubstRegex, &args, - oneBigWord, st->sep); - regfree(&args.re); - free(args.replace); - return AMR_OK; + return AMR_OK; } + #endif /* :Q, :q */ static ApplyModifierResult -ApplyModifier_Quote(const char **pp, ApplyModifiersState *st) +ApplyModifier_Quote(const char **pp, const char *val, ApplyModifiersState *st) { - if ((*pp)[1] == st->endc || (*pp)[1] == ':') { - st->newVal = VarQuote(st->val, **pp == 'q'); - (*pp)++; - return AMR_OK; - } else - return AMR_UNKNOWN; + if ((*pp)[1] == st->endc || (*pp)[1] == ':') { + st->newVal = FStr_InitOwn(VarQuote(val, **pp == 'q')); + (*pp)++; + return AMR_OK; + } else + return AMR_UNKNOWN; } +/*ARGSUSED*/ static void ModifyWord_Copy(const char *word, SepBuf *buf, void *data MAKE_ATTR_UNUSED) { - SepBuf_AddStr(buf, word); + SepBuf_AddStr(buf, word); } /* :ts */ static ApplyModifierResult -ApplyModifier_ToSep(const char **pp, ApplyModifiersState *st) +ApplyModifier_ToSep(const char **pp, const char *val, ApplyModifiersState *st) { - const char *sep = *pp + 2; - - /* ":ts" or ":ts:" */ - if (sep[0] != st->endc && (sep[1] == st->endc || sep[1] == ':')) { - st->sep = sep[0]; - *pp = sep + 1; - goto ok; - } - - /* ":ts" or ":ts:" */ - if (sep[0] == st->endc || sep[0] == ':') { - st->sep = '\0'; /* no separator */ - *pp = sep; - goto ok; - } - - /* ":ts". */ - if (sep[0] != '\\') { - (*pp)++; /* just for backwards compatibility */ - return AMR_BAD; - } - - /* ":ts\n" */ - if (sep[1] == 'n') { - st->sep = '\n'; - *pp = sep + 2; - goto ok; - } - - /* ":ts\t" */ - if (sep[1] == 't') { - st->sep = '\t'; - *pp = sep + 2; - goto ok; - } - - /* ":ts\x40" or ":ts\100" */ - { - const char *p = sep + 1; - int base = 8; /* assume octal */ - - if (sep[1] == 'x') { - base = 16; - p++; - } else if (!ch_isdigit(sep[1])) { - (*pp)++; /* just for backwards compatibility */ - return AMR_BAD; /* ":ts". */ + const char *sep = *pp + 2; + + /* ":ts" or ":ts:" */ + if (sep[0] != st->endc && (sep[1] == st->endc || sep[1] == ':')) { + st->sep = sep[0]; + *pp = sep + 1; + goto ok; } - if (!TryParseChar(&p, base, &st->sep)) { - Parse_Error(PARSE_FATAL, "Invalid character number: %s\n", p); - return AMR_CLEANUP; + /* ":ts" or ":ts:" */ + if (sep[0] == st->endc || sep[0] == ':') { + st->sep = '\0'; /* no separator */ + *pp = sep; + goto ok; } - if (*p != ':' && *p != st->endc) { - (*pp)++; /* just for backwards compatibility */ - return AMR_BAD; + + /* ":ts". */ + if (sep[0] != '\\') { + (*pp)++; /* just for backwards compatibility */ + return AMR_BAD; } - *pp = p; - } + /* ":ts\n" */ + if (sep[1] == 'n') { + st->sep = '\n'; + *pp = sep + 2; + goto ok; + } + + /* ":ts\t" */ + if (sep[1] == 't') { + st->sep = '\t'; + *pp = sep + 2; + goto ok; + } + + /* ":ts\x40" or ":ts\100" */ + { + const char *p = sep + 1; + int base = 8; /* assume octal */ + + if (sep[1] == 'x') { + base = 16; + p++; + } else if (!ch_isdigit(sep[1])) { + (*pp)++; /* just for backwards compatibility */ + return AMR_BAD; /* ":ts". */ + } + + if (!TryParseChar(&p, base, &st->sep)) { + Parse_Error(PARSE_FATAL, + "Invalid character number: %s", p); + return AMR_CLEANUP; + } + if (*p != ':' && *p != st->endc) { + (*pp)++; /* just for backwards compatibility */ + return AMR_BAD; + } + + *pp = p; + } ok: - st->newVal = ModifyWords(st->val, ModifyWord_Copy, NULL, - st->oneBigWord, st->sep); - return AMR_OK; + st->newVal = FStr_InitOwn( + ModifyWords(val, ModifyWord_Copy, NULL, st->oneBigWord, st->sep)); + return AMR_OK; +} + +static char * +str_toupper(const char *str) +{ + char *res; + size_t i, len; + + len = strlen(str); + res = bmake_malloc(len + 1); + for (i = 0; i < len + 1; i++) + res[i] = ch_toupper(str[i]); + + return res; +} + +static char * +str_tolower(const char *str) +{ + char *res; + size_t i, len; + + len = strlen(str); + res = bmake_malloc(len + 1); + for (i = 0; i < len + 1; i++) + res[i] = ch_tolower(str[i]); + + return res; } /* :tA, :tu, :tl, :ts, etc. */ static ApplyModifierResult -ApplyModifier_To(const char **pp, ApplyModifiersState *st) +ApplyModifier_To(const char **pp, const char *val, ApplyModifiersState *st) { - const char *mod = *pp; - assert(mod[0] == 't'); + const char *mod = *pp; + assert(mod[0] == 't'); - if (mod[1] == st->endc || mod[1] == ':' || mod[1] == '\0') { - *pp = mod + 1; - return AMR_BAD; /* Found ":t" or ":t:". */ - } + if (mod[1] == st->endc || mod[1] == ':' || mod[1] == '\0') { + *pp = mod + 1; + return AMR_BAD; /* Found ":t" or ":t:". */ + } - if (mod[1] == 's') - return ApplyModifier_ToSep(pp, st); + if (mod[1] == 's') + return ApplyModifier_ToSep(pp, val, st); - if (mod[2] != st->endc && mod[2] != ':') { - *pp = mod + 1; - return AMR_BAD; /* Found ":t". */ - } - - /* Check for two-character options: ":tu", ":tl" */ - if (mod[1] == 'A') { /* absolute path */ - st->newVal = ModifyWords(st->val, ModifyWord_Realpath, NULL, - st->oneBigWord, st->sep); - *pp = mod + 2; - return AMR_OK; - } + if (mod[2] != st->endc && mod[2] != ':') { + *pp = mod + 1; + return AMR_BAD; /* Found ":t". */ + } - if (mod[1] == 'u') { /* :tu */ - size_t i; - size_t len = strlen(st->val); - st->newVal = bmake_malloc(len + 1); - for (i = 0; i < len + 1; i++) - st->newVal[i] = ch_toupper(st->val[i]); - *pp = mod + 2; - return AMR_OK; - } + /* Check for two-character options: ":tu", ":tl" */ + if (mod[1] == 'A') { /* absolute path */ + st->newVal = FStr_InitOwn( + ModifyWords(val, ModifyWord_Realpath, NULL, + st->oneBigWord, st->sep)); + *pp = mod + 2; + return AMR_OK; + } - if (mod[1] == 'l') { /* :tl */ - size_t i; - size_t len = strlen(st->val); - st->newVal = bmake_malloc(len + 1); - for (i = 0; i < len + 1; i++) - st->newVal[i] = ch_tolower(st->val[i]); - *pp = mod + 2; - return AMR_OK; - } + if (mod[1] == 'u') { /* :tu */ + st->newVal = FStr_InitOwn(str_toupper(val)); + *pp = mod + 2; + return AMR_OK; + } - if (mod[1] == 'W' || mod[1] == 'w') { /* :tW, :tw */ - st->oneBigWord = mod[1] == 'W'; - st->newVal = st->val; - *pp = mod + 2; - return AMR_OK; - } + if (mod[1] == 'l') { /* :tl */ + st->newVal = FStr_InitOwn(str_tolower(val)); + *pp = mod + 2; + return AMR_OK; + } + + if (mod[1] == 'W' || mod[1] == 'w') { /* :tW, :tw */ + st->oneBigWord = mod[1] == 'W'; + st->newVal = FStr_InitRefer(val); + *pp = mod + 2; + return AMR_OK; + } - /* Found ":t:" or ":t". */ - *pp = mod + 1; - return AMR_BAD; + /* Found ":t:" or ":t". */ + *pp = mod + 1; + return AMR_BAD; } /* :[#], :[1], :[-1..1], etc. */ static ApplyModifierResult -ApplyModifier_Words(const char **pp, ApplyModifiersState *st) +ApplyModifier_Words(const char **pp, const char *val, ApplyModifiersState *st) { - char *estr; - int first, last; - VarParseResult res; - const char *p; - - (*pp)++; /* skip the '[' */ - res = ParseModifierPart(pp, ']', st->eflags, st, - &estr, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - - /* now *pp points just after the closing ']' */ - if (**pp != ':' && **pp != st->endc) - goto bad_modifier; /* Found junk after ']' */ - - if (estr[0] == '\0') - goto bad_modifier; /* empty square brackets in ":[]". */ - - if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */ - if (st->oneBigWord) { - st->newVal = bmake_strdup("1"); - } else { - Buffer buf; + char *estr; + int first, last; + VarParseResult res; + const char *p; + + (*pp)++; /* skip the '[' */ + res = ParseModifierPart(pp, ']', st->eflags, st, &estr); + if (res != VPR_OK) + return AMR_CLEANUP; + + /* now *pp points just after the closing ']' */ + if (**pp != ':' && **pp != st->endc) + goto bad_modifier; /* Found junk after ']' */ + + if (estr[0] == '\0') + goto bad_modifier; /* empty square brackets in ":[]". */ - Words words = Str_Words(st->val, FALSE); - size_t ac = words.len; - Words_Free(words); + if (estr[0] == '#' && estr[1] == '\0') { /* Found ":[#]" */ + if (st->oneBigWord) { + st->newVal = FStr_InitRefer("1"); + } else { + Buffer buf; + + Words words = Str_Words(val, FALSE); + size_t ac = words.len; + Words_Free(words); + + /* 3 digits + '\0' is usually enough */ + Buf_InitSize(&buf, 4); + Buf_AddInt(&buf, (int)ac); + st->newVal = FStr_InitOwn(Buf_Destroy(&buf, FALSE)); + } + goto ok; + } + + if (estr[0] == '*' && estr[1] == '\0') { + /* Found ":[*]" */ + st->oneBigWord = TRUE; + st->newVal = FStr_InitRefer(val); + goto ok; + } + + if (estr[0] == '@' && estr[1] == '\0') { + /* Found ":[@]" */ + st->oneBigWord = FALSE; + st->newVal = FStr_InitRefer(val); + goto ok; + } + + /* + * We expect estr to contain a single integer for :[N], or two + * integers separated by ".." for :[start..end]. + */ + p = estr; + if (!TryParseIntBase0(&p, &first)) + goto bad_modifier; /* Found junk instead of a number */ + + if (p[0] == '\0') { /* Found only one integer in :[N] */ + last = first; + } else if (p[0] == '.' && p[1] == '.' && p[2] != '\0') { + /* Expecting another integer after ".." */ + p += 2; + if (!TryParseIntBase0(&p, &last) || *p != '\0') + goto bad_modifier; /* Found junk after ".." */ + } else + goto bad_modifier; /* Found junk instead of ".." */ - Buf_InitSize(&buf, 4); /* 3 digits + '\0' is usually enough */ - Buf_AddInt(&buf, (int)ac); - st->newVal = Buf_Destroy(&buf, FALSE); + /* + * Now first and last are properly filled in, but we still have to + * check for 0 as a special case. + */ + if (first == 0 && last == 0) { + /* ":[0]" or perhaps ":[0..0]" */ + st->oneBigWord = TRUE; + st->newVal = FStr_InitRefer(val); + goto ok; } - goto ok; - } - - if (estr[0] == '*' && estr[1] == '\0') { - /* Found ":[*]" */ - st->oneBigWord = TRUE; - st->newVal = st->val; - goto ok; - } - - if (estr[0] == '@' && estr[1] == '\0') { - /* Found ":[@]" */ - st->oneBigWord = FALSE; - st->newVal = st->val; - goto ok; - } - - /* - * We expect estr to contain a single integer for :[N], or two integers - * separated by ".." for :[start..end]. - */ - p = estr; - if (!TryParseIntBase0(&p, &first)) - goto bad_modifier; /* Found junk instead of a number */ - - if (p[0] == '\0') { /* Found only one integer in :[N] */ - last = first; - } else if (p[0] == '.' && p[1] == '.' && p[2] != '\0') { - /* Expecting another integer after ".." */ - p += 2; - if (!TryParseIntBase0(&p, &last) || *p != '\0') - goto bad_modifier; /* Found junk after ".." */ - } else - goto bad_modifier; /* Found junk instead of ".." */ - - /* - * Now first and last are properly filled in, but we still have to check - * for 0 as a special case. - */ - if (first == 0 && last == 0) { - /* ":[0]" or perhaps ":[0..0]" */ - st->oneBigWord = TRUE; - st->newVal = st->val; - goto ok; - } - - /* ":[0..N]" or ":[N..0]" */ - if (first == 0 || last == 0) - goto bad_modifier; - - /* Normal case: select the words described by first and last. */ - st->newVal = VarSelectWords(st->sep, st->oneBigWord, st->val, first, last); + + /* ":[0..N]" or ":[N..0]" */ + if (first == 0 || last == 0) + goto bad_modifier; + + /* Normal case: select the words described by first and last. */ + st->newVal = FStr_InitOwn( + VarSelectWords(st->sep, st->oneBigWord, val, first, last)); ok: - free(estr); - return AMR_OK; + free(estr); + return AMR_OK; bad_modifier: - free(estr); - return AMR_BAD; + free(estr); + return AMR_BAD; } static int str_cmp_asc(const void *a, const void *b) { - return strcmp(*(const char * const *)a, *(const char * const *)b); + return strcmp(*(const char *const *)a, *(const char *const *)b); } static int str_cmp_desc(const void *a, const void *b) { - return strcmp(*(const char * const *)b, *(const char * const *)a); + return strcmp(*(const char *const *)b, *(const char *const *)a); +} + +static void +ShuffleStrings(char **strs, size_t n) +{ + size_t i; + + for (i = n - 1; i > 0; i--) { + size_t rndidx = (size_t)random() % (i + 1); + char *t = strs[i]; + strs[i] = strs[rndidx]; + strs[rndidx] = t; + } } /* :O (order ascending) or :Or (order descending) or :Ox (shuffle) */ static ApplyModifierResult -ApplyModifier_Order(const char **pp, ApplyModifiersState *st) +ApplyModifier_Order(const char **pp, const char *val, ApplyModifiersState *st) { - const char *mod = (*pp)++; /* skip past the 'O' in any case */ + const char *mod = (*pp)++; /* skip past the 'O' in any case */ - Words words = Str_Words(st->val, FALSE); - - if (mod[1] == st->endc || mod[1] == ':') { - /* :O sorts ascending */ - qsort(words.words, words.len, sizeof words.words[0], str_cmp_asc); + Words words = Str_Words(val, FALSE); - } else if ((mod[1] == 'r' || mod[1] == 'x') && - (mod[2] == st->endc || mod[2] == ':')) { - (*pp)++; + if (mod[1] == st->endc || mod[1] == ':') { + /* :O sorts ascending */ + qsort(words.words, words.len, sizeof words.words[0], + str_cmp_asc); - if (mod[1] == 'r') { - /* :Or sorts descending */ - qsort(words.words, words.len, sizeof words.words[0], str_cmp_desc); + } else if ((mod[1] == 'r' || mod[1] == 'x') && + (mod[2] == st->endc || mod[2] == ':')) { + (*pp)++; + if (mod[1] == 'r') { /* :Or sorts descending */ + qsort(words.words, words.len, sizeof words.words[0], + str_cmp_desc); + } else + ShuffleStrings(words.words, words.len); } else { - /* :Ox shuffles - * - * We will use [ac..2] range for mod factors. This will produce - * random numbers in [(ac-1)..0] interval, and minimal - * reasonable value for mod factor is 2 (the mod 1 will produce - * 0 with probability 1). - */ - size_t i; - for (i = words.len - 1; i > 0; i--) { - size_t rndidx = (size_t)random() % (i + 1); - char *t = words.words[i]; - words.words[i] = words.words[rndidx]; - words.words[rndidx] = t; - } + Words_Free(words); + return AMR_BAD; } - } else { - Words_Free(words); - return AMR_BAD; - } - st->newVal = Words_JoinFree(words); - return AMR_OK; + st->newVal = FStr_InitOwn(Words_JoinFree(words)); + return AMR_OK; } /* :? then : else */ static ApplyModifierResult ApplyModifier_IfElse(const char **pp, ApplyModifiersState *st) { - char *then_expr, *else_expr; - VarParseResult res; - - Boolean value = FALSE; - VarEvalFlags then_eflags = VARE_NONE; - VarEvalFlags else_eflags = VARE_NONE; - - int cond_rc = COND_PARSE; /* anything other than COND_INVALID */ - if (st->eflags & VARE_WANTRES) { - cond_rc = Cond_EvalCondition(st->var->name, &value); - if (cond_rc != COND_INVALID && value) - then_eflags = st->eflags; - if (cond_rc != COND_INVALID && !value) - else_eflags = st->eflags; - } - - (*pp)++; /* skip past the '?' */ - res = ParseModifierPart(pp, ':', then_eflags, st, - &then_expr, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - - res = ParseModifierPart(pp, st->endc, else_eflags, st, - &else_expr, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - - (*pp)--; - if (cond_rc == COND_INVALID) { - Error("Bad conditional expression `%s' in %s?%s:%s", - st->var->name, st->var->name, then_expr, else_expr); - return AMR_CLEANUP; - } - - if (value) { - st->newVal = then_expr; - free(else_expr); - } else { - st->newVal = else_expr; - free(then_expr); - } - ApplyModifiersState_Define(st); - return AMR_OK; + char *then_expr, *else_expr; + VarParseResult res; + + Boolean value = FALSE; + VarEvalFlags then_eflags = VARE_NONE; + VarEvalFlags else_eflags = VARE_NONE; + + int cond_rc = COND_PARSE; /* anything other than COND_INVALID */ + if (st->eflags & VARE_WANTRES) { + cond_rc = Cond_EvalCondition(st->var->name.str, &value); + if (cond_rc != COND_INVALID && value) + then_eflags = st->eflags; + if (cond_rc != COND_INVALID && !value) + else_eflags = st->eflags; + } + + (*pp)++; /* skip past the '?' */ + res = ParseModifierPart(pp, ':', then_eflags, st, &then_expr); + if (res != VPR_OK) + return AMR_CLEANUP; + + res = ParseModifierPart(pp, st->endc, else_eflags, st, &else_expr); + if (res != VPR_OK) + return AMR_CLEANUP; + + (*pp)--; + if (cond_rc == COND_INVALID) { + Error("Bad conditional expression `%s' in %s?%s:%s", + st->var->name.str, st->var->name.str, then_expr, else_expr); + return AMR_CLEANUP; + } + + if (value) { + st->newVal = FStr_InitOwn(then_expr); + free(else_expr); + } else { + st->newVal = FStr_InitOwn(else_expr); + free(then_expr); + } + ApplyModifiersState_Define(st); + return AMR_OK; } /* * The ::= modifiers actually assign a value to the variable. * Their main purpose is in supporting modifiers of .for loop * iterators and other obscure uses. They always expand to * nothing. In a target rule that would otherwise expand to an * empty line they can be preceded with @: to keep make happy. * Eg. * * foo: .USE * .for i in ${.TARGET} ${.TARGET:R}.gz * @: ${t::=$i} * @echo blah ${t:T} * .endfor * * ::= Assigns as the new value of variable. * ::?= Assigns as value of variable if * it was not already set. * ::+= Appends to variable. * ::!= Assigns output of as the new value of * variable. */ static ApplyModifierResult ApplyModifier_Assign(const char **pp, ApplyModifiersState *st) { - GNode *v_ctxt; - char delim; - char *val; - VarParseResult res; - - const char *mod = *pp; - const char *op = mod + 1; - - if (op[0] == '=') - goto ok; - if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=') - goto ok; - return AMR_UNKNOWN; /* "::" */ + GNode *ctxt; + char delim; + char *val; + VarParseResult res; + + const char *mod = *pp; + const char *op = mod + 1; + + if (op[0] == '=') + goto ok; + if ((op[0] == '!' || op[0] == '+' || op[0] == '?') && op[1] == '=') + goto ok; + return AMR_UNKNOWN; /* "::" */ ok: - if (st->var->name[0] == '\0') { - *pp = mod + 1; - return AMR_BAD; - } + if (st->var->name.str[0] == '\0') { + *pp = mod + 1; + return AMR_BAD; + } + + ctxt = st->ctxt; /* context where v belongs */ + if (!(st->exprFlags & VEF_UNDEF) && st->ctxt != VAR_GLOBAL) { + Var *gv = VarFind(st->var->name.str, st->ctxt, FALSE); + if (gv == NULL) + ctxt = VAR_GLOBAL; + else + VarFreeEnv(gv, TRUE); + } - v_ctxt = st->ctxt; /* context where v belongs */ - if (!(st->exprFlags & VEF_UNDEF) && st->ctxt != VAR_GLOBAL) { - Var *gv = VarFind(st->var->name, st->ctxt, FALSE); - if (gv == NULL) - v_ctxt = VAR_GLOBAL; - else - VarFreeEnv(gv, TRUE); - } - - switch (op[0]) { - case '+': - case '?': - case '!': - *pp = mod + 3; - break; - default: - *pp = mod + 2; - break; - } - - delim = st->startc == '(' ? ')' : '}'; - res = ParseModifierPart(pp, delim, st->eflags, st, &val, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - - (*pp)--; - - if (st->eflags & VARE_WANTRES) { switch (op[0]) { case '+': - Var_Append(st->var->name, val, v_ctxt); - break; - case '!': { - const char *errfmt; - char *cmd_output = Cmd_Exec(val, &errfmt); - if (errfmt) - Error(errfmt, val); - else - Var_Set(st->var->name, cmd_output, v_ctxt); - free(cmd_output); - break; - } case '?': - if (!(st->exprFlags & VEF_UNDEF)) + case '!': + *pp = mod + 3; break; - /* FALLTHROUGH */ default: - Var_Set(st->var->name, val, v_ctxt); - break; + *pp = mod + 2; + break; + } + + delim = st->startc == '(' ? ')' : '}'; + res = ParseModifierPart(pp, delim, st->eflags, st, &val); + if (res != VPR_OK) + return AMR_CLEANUP; + + (*pp)--; + + if (st->eflags & VARE_WANTRES) { + switch (op[0]) { + case '+': + Var_Append(st->var->name.str, val, ctxt); + break; + case '!': { + const char *errfmt; + char *cmd_output = Cmd_Exec(val, &errfmt); + if (errfmt != NULL) + Error(errfmt, val); + else + Var_Set(st->var->name.str, cmd_output, ctxt); + free(cmd_output); + break; + } + case '?': + if (!(st->exprFlags & VEF_UNDEF)) + break; + /* FALLTHROUGH */ + default: + Var_Set(st->var->name.str, val, ctxt); + break; + } } - } - free(val); - st->newVal = bmake_strdup(""); - return AMR_OK; + free(val); + st->newVal = FStr_InitRefer(""); + return AMR_OK; } -/* :_=... - * remember current value */ +/* + * :_=... + * remember current value + */ static ApplyModifierResult -ApplyModifier_Remember(const char **pp, ApplyModifiersState *st) +ApplyModifier_Remember(const char **pp, const char *val, + ApplyModifiersState *st) { - const char *mod = *pp; - if (!ModMatchEq(mod, "_", st->endc)) - return AMR_UNKNOWN; - - if (mod[1] == '=') { - size_t n = strcspn(mod + 2, ":)}"); - char *name = bmake_strldup(mod + 2, n); - Var_Set(name, st->val, st->ctxt); - free(name); - *pp = mod + 2 + n; - } else { - Var_Set("_", st->val, st->ctxt); - *pp = mod + 1; - } - st->newVal = st->val; - return AMR_OK; + const char *mod = *pp; + if (!ModMatchEq(mod, "_", st->endc)) + return AMR_UNKNOWN; + + if (mod[1] == '=') { + size_t n = strcspn(mod + 2, ":)}"); + char *name = bmake_strldup(mod + 2, n); + Var_Set(name, val, st->ctxt); + free(name); + *pp = mod + 2 + n; + } else { + Var_Set("_", val, st->ctxt); + *pp = mod + 1; + } + st->newVal = FStr_InitRefer(val); + return AMR_OK; } -/* Apply the given function to each word of the variable value, - * for a single-letter modifier such as :H, :T. */ +/* + * Apply the given function to each word of the variable value, + * for a single-letter modifier such as :H, :T. + */ static ApplyModifierResult -ApplyModifier_WordFunc(const char **pp, ApplyModifiersState *st, - ModifyWordsCallback modifyWord) +ApplyModifier_WordFunc(const char **pp, const char *val, + ApplyModifiersState *st, ModifyWordsCallback modifyWord) { - char delim = (*pp)[1]; - if (delim != st->endc && delim != ':') - return AMR_UNKNOWN; - - st->newVal = ModifyWords(st->val, modifyWord, NULL, - st->oneBigWord, st->sep); - (*pp)++; - return AMR_OK; + char delim = (*pp)[1]; + if (delim != st->endc && delim != ':') + return AMR_UNKNOWN; + + st->newVal = FStr_InitOwn(ModifyWords(val, modifyWord, NULL, + st->oneBigWord, st->sep)); + (*pp)++; + return AMR_OK; } static ApplyModifierResult -ApplyModifier_Unique(const char **pp, ApplyModifiersState *st) +ApplyModifier_Unique(const char **pp, const char *val, ApplyModifiersState *st) { - if ((*pp)[1] == st->endc || (*pp)[1] == ':') { - st->newVal = VarUniq(st->val); - (*pp)++; - return AMR_OK; - } else - return AMR_UNKNOWN; + if ((*pp)[1] == st->endc || (*pp)[1] == ':') { + st->newVal = FStr_InitOwn(VarUniq(val)); + (*pp)++; + return AMR_OK; + } else + return AMR_UNKNOWN; } #ifdef SYSVVARSUB /* :from=to */ static ApplyModifierResult -ApplyModifier_SysV(const char **pp, ApplyModifiersState *st) +ApplyModifier_SysV(const char **pp, const char *val, ApplyModifiersState *st) { - char *lhs, *rhs; - VarParseResult res; - - const char *mod = *pp; - Boolean eqFound = FALSE; - - /* - * First we make a pass through the string trying to verify it is a - * SysV-make-style translation. It must be: = - */ - int depth = 1; - const char *p = mod; - while (*p != '\0' && depth > 0) { - if (*p == '=') { /* XXX: should also test depth == 1 */ - eqFound = TRUE; - /* continue looking for st->endc */ - } else if (*p == st->endc) - depth--; - else if (*p == st->startc) - depth++; - if (depth > 0) - p++; - } - if (*p != st->endc || !eqFound) - return AMR_UNKNOWN; - - *pp = mod; - res = ParseModifierPart(pp, '=', st->eflags, st, - &lhs, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - - /* The SysV modifier lasts until the end of the variable expression. */ - res = ParseModifierPart(pp, st->endc, st->eflags, st, - &rhs, NULL, NULL, NULL); - if (res != VPR_OK) - return AMR_CLEANUP; - - (*pp)--; - if (lhs[0] == '\0' && st->val[0] == '\0') { - st->newVal = st->val; /* special case */ - } else { - struct ModifyWord_SYSVSubstArgs args = {st->ctxt, lhs, rhs}; - st->newVal = ModifyWords(st->val, ModifyWord_SYSVSubst, &args, - st->oneBigWord, st->sep); - } - free(lhs); - free(rhs); - return AMR_OK; + char *lhs, *rhs; + VarParseResult res; + + const char *mod = *pp; + Boolean eqFound = FALSE; + + /* + * First we make a pass through the string trying to verify it is a + * SysV-make-style translation. It must be: = + */ + int depth = 1; + const char *p = mod; + while (*p != '\0' && depth > 0) { + if (*p == '=') { /* XXX: should also test depth == 1 */ + eqFound = TRUE; + /* continue looking for st->endc */ + } else if (*p == st->endc) + depth--; + else if (*p == st->startc) + depth++; + if (depth > 0) + p++; + } + if (*p != st->endc || !eqFound) + return AMR_UNKNOWN; + + res = ParseModifierPart(pp, '=', st->eflags, st, &lhs); + if (res != VPR_OK) + return AMR_CLEANUP; + + /* The SysV modifier lasts until the end of the variable expression. */ + res = ParseModifierPart(pp, st->endc, st->eflags, st, &rhs); + if (res != VPR_OK) + return AMR_CLEANUP; + + (*pp)--; + if (lhs[0] == '\0' && val[0] == '\0') { + st->newVal = FStr_InitRefer(val); /* special case */ + } else { + struct ModifyWord_SYSVSubstArgs args = { st->ctxt, lhs, rhs }; + st->newVal = FStr_InitOwn( + ModifyWords(val, ModifyWord_SYSVSubst, &args, + st->oneBigWord, st->sep)); + } + free(lhs); + free(rhs); + return AMR_OK; } #endif #ifdef SUNSHCMD /* :sh */ static ApplyModifierResult -ApplyModifier_SunShell(const char **pp, ApplyModifiersState *st) +ApplyModifier_SunShell(const char **pp, const char *val, + ApplyModifiersState *st) { - const char *p = *pp; - if (p[1] == 'h' && (p[2] == st->endc || p[2] == ':')) { - if (st->eflags & VARE_WANTRES) { - const char *errfmt; - st->newVal = Cmd_Exec(st->val, &errfmt); - if (errfmt) - Error(errfmt, st->val); + const char *p = *pp; + if (p[1] == 'h' && (p[2] == st->endc || p[2] == ':')) { + if (st->eflags & VARE_WANTRES) { + const char *errfmt; + st->newVal = FStr_InitOwn(Cmd_Exec(val, &errfmt)); + if (errfmt != NULL) + Error(errfmt, val); + } else + st->newVal = FStr_InitRefer(""); + *pp = p + 2; + return AMR_OK; } else - st->newVal = bmake_strdup(""); - *pp = p + 2; - return AMR_OK; - } else - return AMR_UNKNOWN; + return AMR_UNKNOWN; } #endif static void -LogBeforeApply(const ApplyModifiersState *st, const char *mod, const char endc) +LogBeforeApply(const ApplyModifiersState *st, const char *mod, char endc, + const char *val) { - char eflags_str[VarEvalFlags_ToStringSize]; - char vflags_str[VarFlags_ToStringSize]; - char exprflags_str[VarExprFlags_ToStringSize]; - Boolean is_single_char = mod[0] != '\0' && - (mod[1] == endc || mod[1] == ':'); - - /* At this point, only the first character of the modifier can - * be used since the end of the modifier is not yet known. */ - debug_printf("Applying ${%s:%c%s} to \"%s\" (%s, %s, %s)\n", - st->var->name, mod[0], is_single_char ? "" : "...", st->val, - Enum_FlagsToString(eflags_str, sizeof eflags_str, - st->eflags, VarEvalFlags_ToStringSpecs), - Enum_FlagsToString(vflags_str, sizeof vflags_str, - st->var->flags, VarFlags_ToStringSpecs), - Enum_FlagsToString(exprflags_str, sizeof exprflags_str, - st->exprFlags, - VarExprFlags_ToStringSpecs)); + char eflags_str[VarEvalFlags_ToStringSize]; + char vflags_str[VarFlags_ToStringSize]; + char exprflags_str[VarExprFlags_ToStringSize]; + Boolean is_single_char = mod[0] != '\0' && + (mod[1] == endc || mod[1] == ':'); + + /* At this point, only the first character of the modifier can + * be used since the end of the modifier is not yet known. */ + debug_printf("Applying ${%s:%c%s} to \"%s\" (%s, %s, %s)\n", + st->var->name.str, mod[0], is_single_char ? "" : "...", val, + Enum_FlagsToString(eflags_str, sizeof eflags_str, + st->eflags, VarEvalFlags_ToStringSpecs), + Enum_FlagsToString(vflags_str, sizeof vflags_str, + st->var->flags, VarFlags_ToStringSpecs), + Enum_FlagsToString(exprflags_str, sizeof exprflags_str, + st->exprFlags, + VarExprFlags_ToStringSpecs)); } static void LogAfterApply(ApplyModifiersState *st, const char *p, const char *mod) { - char eflags_str[VarEvalFlags_ToStringSize]; - char vflags_str[VarFlags_ToStringSize]; - char exprflags_str[VarExprFlags_ToStringSize]; - const char *quot = st->newVal == var_Error ? "" : "\""; - const char *newVal = st->newVal == var_Error ? "error" : st->newVal; - - debug_printf("Result of ${%s:%.*s} is %s%s%s (%s, %s, %s)\n", - st->var->name, (int)(p - mod), mod, quot, newVal, quot, - Enum_FlagsToString(eflags_str, sizeof eflags_str, - st->eflags, VarEvalFlags_ToStringSpecs), - Enum_FlagsToString(vflags_str, sizeof vflags_str, - st->var->flags, VarFlags_ToStringSpecs), - Enum_FlagsToString(exprflags_str, sizeof exprflags_str, - st->exprFlags, - VarExprFlags_ToStringSpecs)); + char eflags_str[VarEvalFlags_ToStringSize]; + char vflags_str[VarFlags_ToStringSize]; + char exprflags_str[VarExprFlags_ToStringSize]; + const char *quot = st->newVal.str == var_Error ? "" : "\""; + const char *newVal = + st->newVal.str == var_Error ? "error" : st->newVal.str; + + debug_printf("Result of ${%s:%.*s} is %s%s%s (%s, %s, %s)\n", + st->var->name.str, (int)(p - mod), mod, quot, newVal, quot, + Enum_FlagsToString(eflags_str, sizeof eflags_str, + st->eflags, VarEvalFlags_ToStringSpecs), + Enum_FlagsToString(vflags_str, sizeof vflags_str, + st->var->flags, VarFlags_ToStringSpecs), + Enum_FlagsToString(exprflags_str, sizeof exprflags_str, + st->exprFlags, + VarExprFlags_ToStringSpecs)); } static ApplyModifierResult -ApplyModifier(const char **pp, ApplyModifiersState *st) +ApplyModifier(const char **pp, const char *val, ApplyModifiersState *st) { - switch (**pp) { - case ':': - return ApplyModifier_Assign(pp, st); - case '@': - return ApplyModifier_Loop(pp, st); - case '_': - return ApplyModifier_Remember(pp, st); - case 'D': - case 'U': - return ApplyModifier_Defined(pp, st); - case 'L': - return ApplyModifier_Literal(pp, st); - case 'P': - return ApplyModifier_Path(pp, st); - case '!': - return ApplyModifier_ShellCommand(pp, st); - case '[': - return ApplyModifier_Words(pp, st); - case 'g': - return ApplyModifier_Gmtime(pp, st); - case 'h': - return ApplyModifier_Hash(pp, st); - case 'l': - return ApplyModifier_Localtime(pp, st); - case 't': - return ApplyModifier_To(pp, st); - case 'N': - case 'M': - return ApplyModifier_Match(pp, st); - case 'S': - return ApplyModifier_Subst(pp, st); - case '?': - return ApplyModifier_IfElse(pp, st); + switch (**pp) { + case ':': + return ApplyModifier_Assign(pp, st); + case '@': + return ApplyModifier_Loop(pp, val, st); + case '_': + return ApplyModifier_Remember(pp, val, st); + case 'D': + case 'U': + return ApplyModifier_Defined(pp, val, st); + case 'L': + return ApplyModifier_Literal(pp, st); + case 'P': + return ApplyModifier_Path(pp, st); + case '!': + return ApplyModifier_ShellCommand(pp, st); + case '[': + return ApplyModifier_Words(pp, val, st); + case 'g': + return ApplyModifier_Gmtime(pp, val, st); + case 'h': + return ApplyModifier_Hash(pp, val, st); + case 'l': + return ApplyModifier_Localtime(pp, val, st); + case 't': + return ApplyModifier_To(pp, val, st); + case 'N': + case 'M': + return ApplyModifier_Match(pp, val, st); + case 'S': + return ApplyModifier_Subst(pp, val, st); + case '?': + return ApplyModifier_IfElse(pp, st); #ifndef NO_REGEX - case 'C': - return ApplyModifier_Regex(pp, st); + case 'C': + return ApplyModifier_Regex(pp, val, st); #endif - case 'q': - case 'Q': - return ApplyModifier_Quote(pp, st); - case 'T': - return ApplyModifier_WordFunc(pp, st, ModifyWord_Tail); - case 'H': - return ApplyModifier_WordFunc(pp, st, ModifyWord_Head); - case 'E': - return ApplyModifier_WordFunc(pp, st, ModifyWord_Suffix); - case 'R': - return ApplyModifier_WordFunc(pp, st, ModifyWord_Root); - case 'r': - return ApplyModifier_Range(pp, st); - case 'O': - return ApplyModifier_Order(pp, st); - case 'u': - return ApplyModifier_Unique(pp, st); + case 'q': + case 'Q': + return ApplyModifier_Quote(pp, val, st); + case 'T': + return ApplyModifier_WordFunc(pp, val, st, ModifyWord_Tail); + case 'H': + return ApplyModifier_WordFunc(pp, val, st, ModifyWord_Head); + case 'E': + return ApplyModifier_WordFunc(pp, val, st, ModifyWord_Suffix); + case 'R': + return ApplyModifier_WordFunc(pp, val, st, ModifyWord_Root); + case 'r': + return ApplyModifier_Range(pp, val, st); + case 'O': + return ApplyModifier_Order(pp, val, st); + case 'u': + return ApplyModifier_Unique(pp, val, st); #ifdef SUNSHCMD - case 's': - return ApplyModifier_SunShell(pp, st); + case 's': + return ApplyModifier_SunShell(pp, val, st); #endif - default: - return AMR_UNKNOWN; - } + default: + return AMR_UNKNOWN; + } } -static char *ApplyModifiers(const char **, char *, char, char, Var *, - VarExprFlags *, GNode *, VarEvalFlags, void **); +static FStr ApplyModifiers(const char **, FStr, char, char, Var *, + VarExprFlags *, GNode *, VarEvalFlags); typedef enum ApplyModifiersIndirectResult { - AMIR_CONTINUE, - AMIR_APPLY_MODS, - AMIR_OUT + /* The indirect modifiers have been applied successfully. */ + AMIR_CONTINUE, + /* Fall back to the SysV modifier. */ + AMIR_APPLY_MODS, + /* Error out. */ + AMIR_OUT } ApplyModifiersIndirectResult; -/* While expanding a variable expression, expand and apply indirect - * modifiers such as in ${VAR:${M_indirect}}. */ +/* + * While expanding a variable expression, expand and apply indirect modifiers, + * such as in ${VAR:${M_indirect}}. + * + * All indirect modifiers of a group must come from a single variable + * expression. ${VAR:${M1}} is valid but ${VAR:${M1}${M2}} is not. + * + * Multiple groups of indirect modifiers can be chained by separating them + * with colons. ${VAR:${M1}:${M2}} contains 2 indirect modifiers. + * + * If the variable expression is not followed by st->endc or ':', fall + * back to trying the SysV modifier, such as in ${VAR:${FROM}=${TO}}. + * + * The expression ${VAR:${M1}${M2}} is not treated as an indirect + * modifier, and it is neither a SysV modifier but a parse error. + */ static ApplyModifiersIndirectResult -ApplyModifiersIndirect( - ApplyModifiersState *const st, - const char **const inout_p, - void **const inout_freeIt -) { - const char *p = *inout_p; - const char *mods; - void *mods_freeIt; - - (void)Var_Parse(&p, st->ctxt, st->eflags, &mods, &mods_freeIt); - /* TODO: handle errors */ - - /* - * If we have not parsed up to st->endc or ':', we are not - * interested. This means the expression ${VAR:${M_1}${M_2}} - * is not accepted, but ${VAR:${M_1}:${M_2}} is. - */ - if (mods[0] != '\0' && *p != '\0' && *p != ':' && *p != st->endc) { - if (opts.lint) - Parse_Error(PARSE_FATAL, - "Missing delimiter ':' after indirect modifier \"%.*s\"", - (int)(p - *inout_p), *inout_p); - - free(mods_freeIt); - /* XXX: apply_mods doesn't sound like "not interested". */ - /* XXX: Why is the indirect modifier parsed once more by - * apply_mods? If any, p should be advanced to nested_p. */ - return AMIR_APPLY_MODS; - } - - VAR_DEBUG3("Indirect modifier \"%s\" from \"%.*s\"\n", - mods, (int)(p - *inout_p), *inout_p); - - if (mods[0] != '\0') { - const char *rval_pp = mods; - st->val = ApplyModifiers(&rval_pp, st->val, '\0', '\0', st->var, - &st->exprFlags, st->ctxt, st->eflags, - inout_freeIt); - if (st->val == var_Error || st->val == varUndefined || - *rval_pp != '\0') { - free(mods_freeIt); - *inout_p = p; - return AMIR_OUT; /* error already reported */ +ApplyModifiersIndirect(ApplyModifiersState *st, const char **pp, + FStr *inout_value) +{ + const char *p = *pp; + FStr mods; + + (void)Var_Parse(&p, st->ctxt, st->eflags, &mods); + /* TODO: handle errors */ + + if (mods.str[0] != '\0' && *p != '\0' && *p != ':' && *p != st->endc) { + FStr_Done(&mods); + return AMIR_APPLY_MODS; } - } - free(mods_freeIt); - - if (*p == ':') - p++; - else if (*p == '\0' && st->endc != '\0') { - Error("Unclosed variable specification after complex " - "modifier (expecting '%c') for %s", st->endc, st->var->name); - *inout_p = p; - return AMIR_OUT; - } - - *inout_p = p; - return AMIR_CONTINUE; -} -/* Apply any modifiers (such as :Mpattern or :@var@loop@ or :Q or ::=value). */ -static char * -ApplyModifiers( - const char **const pp, /* the parsing position, updated upon return */ - char *const val, /* the current value of the expression */ - char const startc, /* '(' or '{', or '\0' for indirect modifiers */ - char const endc, /* ')' or '}', or '\0' for indirect modifiers */ - Var *const v, - VarExprFlags *const exprFlags, - GNode *const ctxt, /* for looking up and modifying variables */ - VarEvalFlags const eflags, - void **const inout_freeIt /* free this after using the return value */ -) { - ApplyModifiersState st = { - startc, endc, v, ctxt, eflags, - val, /* .val */ - var_Error, /* .newVal */ - ' ', /* .sep */ - FALSE, /* .oneBigWord */ - *exprFlags /* .exprFlags */ - }; - const char *p; - const char *mod; - ApplyModifierResult res; - - assert(startc == '(' || startc == '{' || startc == '\0'); - assert(endc == ')' || endc == '}' || endc == '\0'); - assert(val != NULL); - - p = *pp; - - if (*p == '\0' && endc != '\0') { - Error("Unclosed variable expression (expecting '%c') for \"%s\"", - st.endc, st.var->name); - goto cleanup; - } - - while (*p != '\0' && *p != endc) { - - if (*p == '$') { - ApplyModifiersIndirectResult amir; - amir = ApplyModifiersIndirect(&st, &p, inout_freeIt); - if (amir == AMIR_CONTINUE) - continue; - if (amir == AMIR_OUT) - goto out; + DEBUG3(VAR, "Indirect modifier \"%s\" from \"%.*s\"\n", + mods.str, (int)(p - *pp), *pp); + + if (mods.str[0] != '\0') { + const char *modsp = mods.str; + FStr newVal = ApplyModifiers(&modsp, *inout_value, '\0', '\0', + st->var, &st->exprFlags, st->ctxt, st->eflags); + *inout_value = newVal; + if (newVal.str == var_Error || *modsp != '\0') { + FStr_Done(&mods); + *pp = p; + return AMIR_OUT; /* error already reported */ + } + } + FStr_Done(&mods); + + if (*p == ':') + p++; + else if (*p == '\0' && st->endc != '\0') { + Error("Unclosed variable specification after complex " + "modifier (expecting '%c') for %s", + st->endc, st->var->name.str); + *pp = p; + return AMIR_OUT; } - st.newVal = var_Error; /* default value, in case of errors */ - mod = p; + + *pp = p; + return AMIR_CONTINUE; +} + +static ApplyModifierResult +ApplySingleModifier(ApplyModifiersState *st, const char *mod, char endc, + const char **pp, FStr *inout_value) +{ + ApplyModifierResult res; + const char *p = *pp; + const char *const val = inout_value->str; if (DEBUG(VAR)) - LogBeforeApply(&st, mod, endc); + LogBeforeApply(st, mod, endc, val); - res = ApplyModifier(&p, &st); + res = ApplyModifier(&p, val, st); #ifdef SYSVVARSUB if (res == AMR_UNKNOWN) { - assert(p == mod); - res = ApplyModifier_SysV(&p, &st); + assert(p == mod); + res = ApplyModifier_SysV(&p, val, st); } #endif if (res == AMR_UNKNOWN) { - Error("Unknown modifier '%c'", *mod); - /* Guess the end of the current modifier. - * XXX: Skipping the rest of the modifier hides errors and leads - * to wrong results. Parsing should rather stop here. */ - for (p++; *p != ':' && *p != st.endc && *p != '\0'; p++) - continue; - st.newVal = var_Error; + Parse_Error(PARSE_FATAL, "Unknown modifier '%c'", *mod); + /* + * Guess the end of the current modifier. + * XXX: Skipping the rest of the modifier hides + * errors and leads to wrong results. + * Parsing should rather stop here. + */ + for (p++; *p != ':' && *p != st->endc && *p != '\0'; p++) + continue; + st->newVal = FStr_InitRefer(var_Error); + } + if (res == AMR_CLEANUP || res == AMR_BAD) { + *pp = p; + return res; } - if (res == AMR_CLEANUP) - goto cleanup; - if (res == AMR_BAD) - goto bad_modifier; if (DEBUG(VAR)) - LogAfterApply(&st, p, mod); - - if (st.newVal != st.val) { - if (*inout_freeIt != NULL) { - free(st.val); - *inout_freeIt = NULL; - } - st.val = st.newVal; - if (st.val != var_Error && st.val != varUndefined) - *inout_freeIt = st.val; + LogAfterApply(st, p, mod); + + if (st->newVal.str != val) { + FStr_Done(inout_value); + *inout_value = st->newVal; } - if (*p == '\0' && st.endc != '\0') { - Error("Unclosed variable specification (expecting '%c') " - "for \"%s\" (value \"%s\") modifier %c", - st.endc, st.var->name, st.val, *mod); + if (*p == '\0' && st->endc != '\0') { + Error( + "Unclosed variable specification (expecting '%c') " + "for \"%s\" (value \"%s\") modifier %c", + st->endc, st->var->name.str, inout_value->str, *mod); } else if (*p == ':') { - p++; - } else if (opts.lint && *p != '\0' && *p != endc) { - Parse_Error(PARSE_FATAL, - "Missing delimiter ':' after modifier \"%.*s\"", - (int)(p - mod), mod); - /* TODO: propagate parse error to the enclosing expression */ + p++; + } else if (opts.strict && *p != '\0' && *p != endc) { + Parse_Error(PARSE_FATAL, + "Missing delimiter ':' after modifier \"%.*s\"", + (int)(p - mod), mod); + /* + * TODO: propagate parse error to the enclosing + * expression + */ + } + *pp = p; + return AMR_OK; +} + +/* Apply any modifiers (such as :Mpattern or :@var@loop@ or :Q or ::=value). */ +static FStr +ApplyModifiers( + const char **pp, /* the parsing position, updated upon return */ + FStr value, /* the current value of the expression */ + char startc, /* '(' or '{', or '\0' for indirect modifiers */ + char endc, /* ')' or '}', or '\0' for indirect modifiers */ + Var *v, + VarExprFlags *exprFlags, + GNode *ctxt, /* for looking up and modifying variables */ + VarEvalFlags eflags +) +{ + ApplyModifiersState st = { + startc, endc, v, ctxt, eflags, + FStr_InitRefer(var_Error), /* .newVal */ + ' ', /* .sep */ + FALSE, /* .oneBigWord */ + *exprFlags /* .exprFlags */ + }; + const char *p; + const char *mod; + + assert(startc == '(' || startc == '{' || startc == '\0'); + assert(endc == ')' || endc == '}' || endc == '\0'); + assert(value.str != NULL); + + p = *pp; + + if (*p == '\0' && endc != '\0') { + Error( + "Unclosed variable expression (expecting '%c') for \"%s\"", + st.endc, st.var->name.str); + goto cleanup; + } + + while (*p != '\0' && *p != endc) { + ApplyModifierResult res; + + if (*p == '$') { + ApplyModifiersIndirectResult amir; + amir = ApplyModifiersIndirect(&st, &p, &value); + if (amir == AMIR_CONTINUE) + continue; + if (amir == AMIR_OUT) + break; + } + + /* default value, in case of errors */ + st.newVal = FStr_InitRefer(var_Error); + mod = p; + + res = ApplySingleModifier(&st, mod, endc, &p, &value); + if (res == AMR_CLEANUP) + goto cleanup; + if (res == AMR_BAD) + goto bad_modifier; } - } -out: - *pp = p; - assert(st.val != NULL); /* Use var_Error or varUndefined instead. */ - *exprFlags = st.exprFlags; - return st.val; + + *pp = p; + assert(value.str != NULL); /* Use var_Error or varUndefined instead. */ + *exprFlags = st.exprFlags; + return value; bad_modifier: - /* XXX: The modifier end is only guessed. */ - Error("Bad modifier `:%.*s' for %s", - (int)strcspn(mod, ":)}"), mod, st.var->name); + /* XXX: The modifier end is only guessed. */ + Error("Bad modifier `:%.*s' for %s", + (int)strcspn(mod, ":)}"), mod, st.var->name.str); cleanup: - *pp = p; - free(*inout_freeIt); - *inout_freeIt = NULL; - *exprFlags = st.exprFlags; - return var_Error; + *pp = p; + FStr_Done(&value); + *exprFlags = st.exprFlags; + return FStr_InitRefer(var_Error); } -/* Only four of the local variables are treated specially as they are the - * only four that will be set when dynamic sources are expanded. */ +/* + * Only four of the local variables are treated specially as they are the + * only four that will be set when dynamic sources are expanded. + */ static Boolean VarnameIsDynamic(const char *name, size_t len) { - if (len == 1 || (len == 2 && (name[1] == 'F' || name[1] == 'D'))) { - switch (name[0]) { - case '@': - case '%': - case '*': - case '!': - return TRUE; + if (len == 1 || (len == 2 && (name[1] == 'F' || name[1] == 'D'))) { + switch (name[0]) { + case '@': + case '%': + case '*': + case '!': + return TRUE; + } + return FALSE; } - return FALSE; - } - if ((len == 7 || len == 8) && name[0] == '.' && ch_isupper(name[1])) { - return strcmp(name, ".TARGET") == 0 || - strcmp(name, ".ARCHIVE") == 0 || - strcmp(name, ".PREFIX") == 0 || - strcmp(name, ".MEMBER") == 0; - } + if ((len == 7 || len == 8) && name[0] == '.' && ch_isupper(name[1])) { + return strcmp(name, ".TARGET") == 0 || + strcmp(name, ".ARCHIVE") == 0 || + strcmp(name, ".PREFIX") == 0 || + strcmp(name, ".MEMBER") == 0; + } - return FALSE; + return FALSE; } static const char * -UndefinedShortVarValue(char varname, const GNode *ctxt, VarEvalFlags eflags) +UndefinedShortVarValue(char varname, const GNode *ctxt) { - if (ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL) { - /* - * If substituting a local variable in a non-local context, - * assume it's for dynamic source stuff. We have to handle - * this specially and return the longhand for the variable - * with the dollar sign escaped so it makes it back to the - * caller. Only four of the local variables are treated - * specially as they are the only four that will be set - * when dynamic sources are expanded. - */ - switch (varname) { - case '@': - return "$(.TARGET)"; - case '%': - return "$(.MEMBER)"; - case '*': - return "$(.PREFIX)"; - case '!': - return "$(.ARCHIVE)"; + if (ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL) { + /* + * If substituting a local variable in a non-local context, + * assume it's for dynamic source stuff. We have to handle + * this specially and return the longhand for the variable + * with the dollar sign escaped so it makes it back to the + * caller. Only four of the local variables are treated + * specially as they are the only four that will be set + * when dynamic sources are expanded. + */ + switch (varname) { + case '@': + return "$(.TARGET)"; + case '%': + return "$(.MEMBER)"; + case '*': + return "$(.PREFIX)"; + case '!': + return "$(.ARCHIVE)"; + } } - } - return eflags & VARE_UNDEFERR ? var_Error : varUndefined; + return NULL; } -/* Parse a variable name, until the end character or a colon, whichever - * comes first. */ +/* + * Parse a variable name, until the end character or a colon, whichever + * comes first. + */ static char * ParseVarname(const char **pp, char startc, char endc, GNode *ctxt, VarEvalFlags eflags, size_t *out_varname_len) { - Buffer buf; - const char *p = *pp; - int depth = 1; - - Buf_Init(&buf); - - while (*p != '\0') { - /* Track depth so we can spot parse errors. */ - if (*p == startc) - depth++; - if (*p == endc) { - if (--depth == 0) - break; - } - if (*p == ':' && depth == 1) - break; - - /* A variable inside a variable, expand. */ - if (*p == '$') { - const char *nested_val; - void *nested_val_freeIt; - (void)Var_Parse(&p, ctxt, eflags, &nested_val, &nested_val_freeIt); - /* TODO: handle errors */ - Buf_AddStr(&buf, nested_val); - free(nested_val_freeIt); - } else { - Buf_AddByte(&buf, *p); - p++; + Buffer buf; + const char *p = *pp; + int depth = 1; + + Buf_Init(&buf); + + while (*p != '\0') { + /* Track depth so we can spot parse errors. */ + if (*p == startc) + depth++; + if (*p == endc) { + if (--depth == 0) + break; + } + if (*p == ':' && depth == 1) + break; + + /* A variable inside a variable, expand. */ + if (*p == '$') { + FStr nested_val; + (void)Var_Parse(&p, ctxt, eflags, &nested_val); + /* TODO: handle errors */ + Buf_AddStr(&buf, nested_val.str); + FStr_Done(&nested_val); + } else { + Buf_AddByte(&buf, *p); + p++; + } } - } - *pp = p; - *out_varname_len = Buf_Len(&buf); - return Buf_Destroy(&buf, FALSE); + *pp = p; + *out_varname_len = Buf_Len(&buf); + return Buf_Destroy(&buf, FALSE); } static VarParseResult ValidShortVarname(char varname, const char *start) { - switch (varname) { - case '\0': - case ')': - case '}': - case ':': - case '$': - break; /* and continue below */ - default: - return VPR_OK; - } + switch (varname) { + case '\0': + case ')': + case '}': + case ':': + case '$': + break; /* and continue below */ + default: + return VPR_OK; + } - if (!opts.lint) - return VPR_PARSE_SILENT; + if (!opts.strict) + return VPR_ERR; /* XXX: Missing error message */ - if (varname == '$') - Parse_Error(PARSE_FATAL, + if (varname == '$') + Parse_Error(PARSE_FATAL, "To escape a dollar, use \\$, not $$, at \"%s\"", start); - else if (varname == '\0') - Parse_Error(PARSE_FATAL, "Dollar followed by nothing"); - else - Parse_Error(PARSE_FATAL, + else if (varname == '\0') + Parse_Error(PARSE_FATAL, "Dollar followed by nothing"); + else + Parse_Error(PARSE_FATAL, "Invalid variable name '%c', at \"%s\"", varname, start); - return VPR_PARSE_MSG; + return VPR_ERR; } -/* Parse a single-character variable name such as $V or $@. - * Return whether to continue parsing. */ +/* + * Parse a single-character variable name such as $V or $@. + * Return whether to continue parsing. + */ static Boolean ParseVarnameShort(char startc, const char **pp, GNode *ctxt, VarEvalFlags eflags, VarParseResult *out_FALSE_res, const char **out_FALSE_val, Var **out_TRUE_var) { - char name[2]; - Var *v; - VarParseResult vpr; - - /* - * If it's not bounded by braces of some sort, life is much simpler. - * We just need to check for the first character and return the - * value if it exists. - */ - - vpr = ValidShortVarname(startc, *pp); - if (vpr != VPR_OK) { - (*pp)++; - *out_FALSE_val = var_Error; - *out_FALSE_res = vpr; - return FALSE; - } + char name[2]; + Var *v; + VarParseResult vpr; - name[0] = startc; - name[1] = '\0'; - v = VarFind(name, ctxt, TRUE); - if (v == NULL) { - *pp += 2; + /* + * If it's not bounded by braces of some sort, life is much simpler. + * We just need to check for the first character and return the + * value if it exists. + */ - *out_FALSE_val = UndefinedShortVarValue(startc, ctxt, eflags); - if (opts.lint && *out_FALSE_val == var_Error) { - Parse_Error(PARSE_FATAL, "Variable \"%s\" is undefined", name); - *out_FALSE_res = VPR_UNDEF_MSG; - return FALSE; + vpr = ValidShortVarname(startc, *pp); + if (vpr != VPR_OK) { + (*pp)++; + *out_FALSE_val = var_Error; + *out_FALSE_res = vpr; + return FALSE; + } + + name[0] = startc; + name[1] = '\0'; + v = VarFind(name, ctxt, TRUE); + if (v == NULL) { + const char *val; + *pp += 2; + + val = UndefinedShortVarValue(startc, ctxt); + if (val == NULL) + val = eflags & VARE_UNDEFERR ? var_Error : varUndefined; + + if (opts.strict && val == var_Error) { + Parse_Error(PARSE_FATAL, + "Variable \"%s\" is undefined", name); + *out_FALSE_res = VPR_ERR; + *out_FALSE_val = val; + return FALSE; + } + + /* + * XXX: This looks completely wrong. + * + * If undefined expressions are not allowed, this should + * rather be VPR_ERR instead of VPR_UNDEF, together with an + * error message. + * + * If undefined expressions are allowed, this should rather + * be VPR_UNDEF instead of VPR_OK. + */ + *out_FALSE_res = eflags & VARE_UNDEFERR ? VPR_UNDEF : VPR_OK; + *out_FALSE_val = val; + return FALSE; } - *out_FALSE_res = eflags & VARE_UNDEFERR ? VPR_UNDEF_SILENT : VPR_OK; - return FALSE; - } - *out_TRUE_var = v; - return TRUE; + *out_TRUE_var = v; + return TRUE; } /* Find variables like @F or ", varname[0]) == NULL) - return NULL; - - { - char name[] = { varname[0], '\0' }; - Var *v = VarFind(name, ctxt, FALSE); - - if (v != NULL) { - if (varname[1] == 'D') { - *out_extraModifiers = "H:"; - } else { /* F */ - *out_extraModifiers = "T:"; - } + /* Only resolve these variables if ctxt is a "real" target. */ + if (ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL) + return NULL; + + if (namelen != 2) + return NULL; + if (varname[1] != 'F' && varname[1] != 'D') + return NULL; + if (strchr("@%?*!<>", varname[0]) == NULL) + return NULL; + + { + char name[] = { varname[0], '\0' }; + Var *v = VarFind(name, ctxt, FALSE); + + if (v != NULL) { + if (varname[1] == 'D') { + *out_extraModifiers = "H:"; + } else { /* F */ + *out_extraModifiers = "T:"; + } + } + return v; } - return v; - } } static VarParseResult EvalUndefined(Boolean dynamic, const char *start, const char *p, char *varname, VarEvalFlags eflags, - void **out_freeIt, const char **out_val) + FStr *out_val) { - if (dynamic) { - char *pstr = bmake_strsedup(start, p); - free(varname); - *out_freeIt = pstr; - *out_val = pstr; - return VPR_OK; - } + if (dynamic) { + *out_val = FStr_InitOwn(bmake_strsedup(start, p)); + free(varname); + return VPR_OK; + } - if ((eflags & VARE_UNDEFERR) && opts.lint) { - Parse_Error(PARSE_FATAL, "Variable \"%s\" is undefined", varname); - free(varname); - *out_val = var_Error; - return VPR_UNDEF_MSG; - } + if ((eflags & VARE_UNDEFERR) && opts.strict) { + Parse_Error(PARSE_FATAL, + "Variable \"%s\" is undefined", varname); + free(varname); + *out_val = FStr_InitRefer(var_Error); + return VPR_ERR; + } - if (eflags & VARE_UNDEFERR) { - free(varname); - *out_val = var_Error; - return VPR_UNDEF_SILENT; - } + if (eflags & VARE_UNDEFERR) { + free(varname); + *out_val = FStr_InitRefer(var_Error); + return VPR_UNDEF; /* XXX: Should be VPR_ERR instead. */ + } - free(varname); - *out_val = varUndefined; - return VPR_OK; + free(varname); + *out_val = FStr_InitRefer(varUndefined); + return VPR_OK; } -/* Parse a long variable name enclosed in braces or parentheses such as $(VAR) +/* + * Parse a long variable name enclosed in braces or parentheses such as $(VAR) * or ${VAR}, up to the closing brace or parenthesis, or in the case of * ${VAR:Modifiers}, up to the ':' that starts the modifiers. - * Return whether to continue parsing. */ + * Return whether to continue parsing. + */ static Boolean ParseVarnameLong( const char *p, char startc, GNode *ctxt, VarEvalFlags eflags, const char **out_FALSE_pp, VarParseResult *out_FALSE_res, - const char **out_FALSE_val, - void **out_FALSE_freeIt, + FStr *out_FALSE_val, char *out_TRUE_endc, const char **out_TRUE_p, Var **out_TRUE_v, Boolean *out_TRUE_haveModifier, const char **out_TRUE_extraModifiers, Boolean *out_TRUE_dynamic, VarExprFlags *out_TRUE_exprFlags -) { - size_t namelen; - char *varname; - Var *v; - Boolean haveModifier; - Boolean dynamic = FALSE; - - const char *const start = p; - char endc = startc == '(' ? ')' : '}'; - - p += 2; /* skip "${" or "$(" or "y(" */ - varname = ParseVarname(&p, startc, endc, ctxt, eflags, &namelen); - - if (*p == ':') { - haveModifier = TRUE; - } else if (*p == endc) { - haveModifier = FALSE; - } else { - Parse_Error(PARSE_FATAL, "Unclosed variable \"%s\"", varname); - free(varname); - *out_FALSE_pp = p; - *out_FALSE_val = var_Error; - *out_FALSE_res = VPR_PARSE_MSG; - return FALSE; - } +) +{ + size_t namelen; + char *varname; + Var *v; + Boolean haveModifier; + Boolean dynamic = FALSE; - v = VarFind(varname, ctxt, TRUE); + const char *const start = p; + char endc = startc == '(' ? ')' : '}'; - /* At this point, p points just after the variable name, - * either at ':' or at endc. */ + p += 2; /* skip "${" or "$(" or "y(" */ + varname = ParseVarname(&p, startc, endc, ctxt, eflags, &namelen); - if (v == NULL) - v = FindLocalLegacyVar(varname, namelen, ctxt, out_TRUE_extraModifiers); + if (*p == ':') { + haveModifier = TRUE; + } else if (*p == endc) { + haveModifier = FALSE; + } else { + Parse_Error(PARSE_FATAL, "Unclosed variable \"%s\"", varname); + free(varname); + *out_FALSE_pp = p; + *out_FALSE_val = FStr_InitRefer(var_Error); + *out_FALSE_res = VPR_ERR; + return FALSE; + } - if (v == NULL) { - /* Defer expansion of dynamic variables if they appear in non-local - * context since they are not defined there. */ - dynamic = VarnameIsDynamic(varname, namelen) && - (ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL); + v = VarFind(varname, ctxt, TRUE); - if (!haveModifier) { - p++; /* skip endc */ - *out_FALSE_pp = p; - *out_FALSE_res = EvalUndefined(dynamic, start, p, varname, eflags, - out_FALSE_freeIt, out_FALSE_val); - return FALSE; + /* At this point, p points just after the variable name, + * either at ':' or at endc. */ + + if (v == NULL) { + v = FindLocalLegacyVar(varname, namelen, ctxt, + out_TRUE_extraModifiers); } - /* The variable expression is based on an undefined variable. - * Nevertheless it needs a Var, for modifiers that access the - * variable name, such as :L or :?. - * - * Most modifiers leave this expression in the "undefined" state - * (VEF_UNDEF), only a few modifiers like :D, :U, :L, :P turn this - * undefined expression into a defined expression (VEF_DEF). - * - * At the end, after applying all modifiers, if the expression - * is still undefined, Var_Parse will return an empty string - * instead of the actually computed value. */ - v = VarNew(varname, varname, "", 0); - *out_TRUE_exprFlags = VEF_UNDEF; - } else - free(varname); + if (v == NULL) { + /* + * Defer expansion of dynamic variables if they appear in + * non-local context since they are not defined there. + */ + dynamic = VarnameIsDynamic(varname, namelen) && + (ctxt == VAR_CMDLINE || ctxt == VAR_GLOBAL); + + if (!haveModifier) { + p++; /* skip endc */ + *out_FALSE_pp = p; + *out_FALSE_res = EvalUndefined(dynamic, start, p, + varname, eflags, out_FALSE_val); + return FALSE; + } + + /* + * The variable expression is based on an undefined variable. + * Nevertheless it needs a Var, for modifiers that access the + * variable name, such as :L or :?. + * + * Most modifiers leave this expression in the "undefined" + * state (VEF_UNDEF), only a few modifiers like :D, :U, :L, + * :P turn this undefined expression into a defined + * expression (VEF_DEF). + * + * At the end, after applying all modifiers, if the expression + * is still undefined, Var_Parse will return an empty string + * instead of the actually computed value. + */ + v = VarNew(FStr_InitOwn(varname), "", VAR_NONE); + *out_TRUE_exprFlags = VEF_UNDEF; + } else + free(varname); + + *out_TRUE_endc = endc; + *out_TRUE_p = p; + *out_TRUE_v = v; + *out_TRUE_haveModifier = haveModifier; + *out_TRUE_dynamic = dynamic; + return TRUE; +} + +/* Free the environment variable now since we own it. */ +static void +FreeEnvVar(void **out_val_freeIt, Var *v, const char *value) +{ + char *varValue = Buf_Destroy(&v->val, FALSE); + if (value == varValue) + *out_val_freeIt = varValue; + else + free(varValue); - *out_TRUE_endc = endc; - *out_TRUE_p = p; - *out_TRUE_v = v; - *out_TRUE_haveModifier = haveModifier; - *out_TRUE_dynamic = dynamic; - return TRUE; + FStr_Done(&v->name); + free(v); } /* * Given the start of a variable expression (such as $v, $(VAR), * ${VAR:Mpattern}), extract the variable name and value, and the modifiers, * if any. While doing that, apply the modifiers to the value of the * expression, forming its final value. A few of the modifiers such as :!cmd! * or ::= have side effects. * * Input: * *pp The string to parse. * When parsing a condition in ParseEmptyArg, it may also * point to the "y" of "empty(VARNAME:Modifiers)", which * is syntactically the same. * ctxt The context for finding variables * eflags Control the exact details of parsing * * Output: * *pp The position where to continue parsing. * TODO: After a parse error, the value of *pp is * unspecified. It may not have been updated at all, * point to some random character in the string, to the * location of the parse error, or at the end of the * string. * *out_val The value of the variable expression, never NULL. * *out_val var_Error if there was a parse error. * *out_val var_Error if the base variable of the expression was * undefined, eflags contains VARE_UNDEFERR, and none of * the modifiers turned the undefined expression into a * defined expression. * XXX: It is not guaranteed that an error message has * been printed. * *out_val varUndefined if the base variable of the expression * was undefined, eflags did not contain VARE_UNDEFERR, * and none of the modifiers turned the undefined * expression into a defined expression. * XXX: It is not guaranteed that an error message has * been printed. * *out_val_freeIt Must be freed by the caller after using *out_val. */ /* coverity[+alloc : arg-*4] */ VarParseResult -Var_Parse(const char **pp, GNode *ctxt, VarEvalFlags eflags, - const char **out_val, void **out_val_freeIt) +Var_Parse(const char **pp, GNode *ctxt, VarEvalFlags eflags, FStr *out_val) { - const char *p = *pp; - const char *const start = p; - Boolean haveModifier; /* TRUE if have modifiers for the variable */ - char startc; /* Starting character if variable in parens - * or braces */ - char endc; /* Ending character if variable in parens - * or braces */ - Boolean dynamic; /* TRUE if the variable is local and we're - * expanding it in a non-local context. This - * is done to support dynamic sources. The - * result is just the expression, unaltered */ - const char *extramodifiers; - Var *v; - char *value; - char eflags_str[VarEvalFlags_ToStringSize]; - VarExprFlags exprFlags = 0; - - VAR_DEBUG2("Var_Parse: %s with %s\n", start, - Enum_FlagsToString(eflags_str, sizeof eflags_str, eflags, - VarEvalFlags_ToStringSpecs)); - - *out_val_freeIt = NULL; - extramodifiers = NULL; /* extra modifiers to apply first */ - dynamic = FALSE; - - /* Appease GCC, which thinks that the variable might not be - * initialized. */ - endc = '\0'; - - startc = p[1]; - if (startc != '(' && startc != '{') { - VarParseResult res; - if (!ParseVarnameShort(startc, pp, ctxt, eflags, &res, out_val, &v)) - return res; - haveModifier = FALSE; - p++; - } else { - VarParseResult res; - if (!ParseVarnameLong(p, startc, ctxt, eflags, - pp, &res, out_val, out_val_freeIt, - &endc, &p, &v, &haveModifier, &extramodifiers, - &dynamic, &exprFlags)) - return res; - } - - if (v->flags & VAR_IN_USE) - Fatal("Variable %s is recursive.", v->name); - - /* XXX: This assignment creates an alias to the current value of the - * variable. This means that as long as the value of the expression stays - * the same, the value of the variable must not change. - * Using the '::=' modifier, it could be possible to do exactly this. - * At the bottom of this function, the resulting value is compared to the - * then-current value of the variable. This might also invoke undefined - * behavior. */ - value = Buf_GetAll(&v->val, NULL); - - /* Before applying any modifiers, expand any nested expressions from the - * variable value. */ - if (strchr(value, '$') != NULL && (eflags & VARE_WANTRES)) { - VarEvalFlags nested_eflags = eflags; - if (opts.lint) - nested_eflags &= ~(unsigned)VARE_UNDEFERR; - v->flags |= VAR_IN_USE; - (void)Var_Subst(value, ctxt, nested_eflags, &value); - v->flags &= ~(unsigned)VAR_IN_USE; - /* TODO: handle errors */ - *out_val_freeIt = value; - } + const char *p = *pp; + const char *const start = p; + /* TRUE if have modifiers for the variable. */ + Boolean haveModifier; + /* Starting character if variable in parens or braces. */ + char startc; + /* Ending character if variable in parens or braces. */ + char endc; + /* + * TRUE if the variable is local and we're expanding it in a + * non-local context. This is done to support dynamic sources. + * The result is just the expression, unaltered. + */ + Boolean dynamic; + const char *extramodifiers; + Var *v; + FStr value; + char eflags_str[VarEvalFlags_ToStringSize]; + VarExprFlags exprFlags = VEF_NONE; + + DEBUG2(VAR, "Var_Parse: %s with %s\n", start, + Enum_FlagsToString(eflags_str, sizeof eflags_str, eflags, + VarEvalFlags_ToStringSpecs)); - if (haveModifier || extramodifiers != NULL) { - void *extraFree; + *out_val = FStr_InitRefer(NULL); + extramodifiers = NULL; /* extra modifiers to apply first */ + dynamic = FALSE; - extraFree = NULL; - if (extramodifiers != NULL) { - const char *em = extramodifiers; - value = ApplyModifiers(&em, value, '\0', '\0', - v, &exprFlags, ctxt, eflags, &extraFree); + /* + * Appease GCC, which thinks that the variable might not be + * initialized. + */ + endc = '\0'; + + startc = p[1]; + if (startc != '(' && startc != '{') { + VarParseResult res; + if (!ParseVarnameShort(startc, pp, ctxt, eflags, &res, + &out_val->str, &v)) + return res; + haveModifier = FALSE; + p++; + } else { + VarParseResult res; + if (!ParseVarnameLong(p, startc, ctxt, eflags, + pp, &res, out_val, + &endc, &p, &v, &haveModifier, &extramodifiers, + &dynamic, &exprFlags)) + return res; } - if (haveModifier) { - /* Skip initial colon. */ - p++; + if (v->flags & VAR_IN_USE) + Fatal("Variable %s is recursive.", v->name.str); - value = ApplyModifiers(&p, value, startc, endc, - v, &exprFlags, ctxt, eflags, out_val_freeIt); - free(extraFree); - } else { - *out_val_freeIt = extraFree; + /* + * XXX: This assignment creates an alias to the current value of the + * variable. This means that as long as the value of the expression + * stays the same, the value of the variable must not change. + * Using the '::=' modifier, it could be possible to do exactly this. + * At the bottom of this function, the resulting value is compared to + * the then-current value of the variable. This might also invoke + * undefined behavior. + */ + value = FStr_InitRefer(Buf_GetAll(&v->val, NULL)); + + /* + * Before applying any modifiers, expand any nested expressions from + * the variable value. + */ + if (strchr(value.str, '$') != NULL && (eflags & VARE_WANTRES)) { + char *expanded; + VarEvalFlags nested_eflags = eflags; + if (opts.strict) + nested_eflags &= ~(unsigned)VARE_UNDEFERR; + v->flags |= VAR_IN_USE; + (void)Var_Subst(value.str, ctxt, nested_eflags, &expanded); + v->flags &= ~(unsigned)VAR_IN_USE; + /* TODO: handle errors */ + value = FStr_InitOwn(expanded); } - } - - if (*p != '\0') /* Skip past endc if possible. */ - p++; - - *pp = p; - - if (v->flags & VAR_FROM_ENV) { - /* Free the environment variable now since we own it, - * but don't free the variable value if it will be returned. */ - Boolean keepValue = value == Buf_GetAll(&v->val, NULL); - if (keepValue) - *out_val_freeIt = value; - (void)VarFreeEnv(v, !keepValue); - - } else if (exprFlags & VEF_UNDEF) { - if (!(exprFlags & VEF_DEF)) { - /* TODO: Use a local variable instead of out_val_freeIt. - * Variables named out_* must only be written to. */ - if (*out_val_freeIt != NULL) { - free(*out_val_freeIt); - *out_val_freeIt = NULL; - } - if (dynamic) { - value = bmake_strsedup(start, p); - *out_val_freeIt = value; - } else { - /* The expression is still undefined, therefore discard the - * actual value and return an error marker instead. */ - value = eflags & VARE_UNDEFERR ? var_Error : varUndefined; - } + + if (haveModifier || extramodifiers != NULL) { + if (extramodifiers != NULL) { + const char *em = extramodifiers; + value = ApplyModifiers(&em, value, '\0', '\0', + v, &exprFlags, ctxt, eflags); + } + + if (haveModifier) { + p++; /* Skip initial colon. */ + + value = ApplyModifiers(&p, value, startc, endc, + v, &exprFlags, ctxt, eflags); + } } - if (value != Buf_GetAll(&v->val, NULL)) - Buf_Destroy(&v->val, TRUE); - free(v->name_freeIt); - free(v); - } - *out_val = value; - return VPR_UNKNOWN; + + if (*p != '\0') /* Skip past endc if possible. */ + p++; + + *pp = p; + + if (v->flags & VAR_FROM_ENV) { + FreeEnvVar(&value.freeIt, v, value.str); + + } else if (exprFlags & VEF_UNDEF) { + if (!(exprFlags & VEF_DEF)) { + FStr_Done(&value); + if (dynamic) { + value = FStr_InitOwn(bmake_strsedup(start, p)); + } else { + /* + * The expression is still undefined, + * therefore discard the actual value and + * return an error marker instead. + */ + value = FStr_InitRefer(eflags & VARE_UNDEFERR + ? var_Error : varUndefined); + } + } + if (value.str != Buf_GetAll(&v->val, NULL)) + Buf_Destroy(&v->val, TRUE); + FStr_Done(&v->name); + free(v); + } + *out_val = (FStr){ value.str, value.freeIt }; + return VPR_OK; /* XXX: Is not correct in all cases */ +} + +static void +VarSubstDollarDollar(const char **pp, Buffer *res, VarEvalFlags eflags) +{ + /* + * A dollar sign may be escaped with another dollar + * sign. + */ + if (save_dollars && (eflags & VARE_KEEP_DOLLAR)) + Buf_AddByte(res, '$'); + Buf_AddByte(res, '$'); + *pp += 2; } static void -VarSubstNested(const char **const pp, Buffer *const buf, GNode *const ctxt, - VarEvalFlags const eflags, Boolean *inout_errorReported) +VarSubstExpr(const char **pp, Buffer *buf, GNode *ctxt, + VarEvalFlags eflags, Boolean *inout_errorReported) { - const char *p = *pp; - const char *nested_p = p; - const char *val; - void *val_freeIt; - - (void)Var_Parse(&nested_p, ctxt, eflags, &val, &val_freeIt); - /* TODO: handle errors */ - - if (val == var_Error || val == varUndefined) { - if (!preserveUndefined) { - p = nested_p; - } else if ((eflags & VARE_UNDEFERR) || val == var_Error) { - /* XXX: This condition is wrong. If val == var_Error, - * this doesn't necessarily mean there was an undefined - * variable. It could equally well be a parse error; see - * unit-tests/varmod-order.exp. */ - - /* - * If variable is undefined, complain and skip the - * variable. The complaint will stop us from doing anything - * when the file is parsed. - */ - if (!*inout_errorReported) { - Parse_Error(PARSE_FATAL, "Undefined variable \"%.*s\"", - (int)(size_t)(nested_p - p), p); - } - p = nested_p; - *inout_errorReported = TRUE; + const char *p = *pp; + const char *nested_p = p; + FStr val; + + (void)Var_Parse(&nested_p, ctxt, eflags, &val); + /* TODO: handle errors */ + + if (val.str == var_Error || val.str == varUndefined) { + if (!(eflags & VARE_KEEP_UNDEF)) { + p = nested_p; + } else if ((eflags & VARE_UNDEFERR) || val.str == var_Error) { + + /* + * XXX: This condition is wrong. If val == var_Error, + * this doesn't necessarily mean there was an undefined + * variable. It could equally well be a parse error; + * see unit-tests/varmod-order.exp. + */ + + /* + * If variable is undefined, complain and skip the + * variable. The complaint will stop us from doing + * anything when the file is parsed. + */ + if (!*inout_errorReported) { + Parse_Error(PARSE_FATAL, + "Undefined variable \"%.*s\"", + (int)(size_t)(nested_p - p), p); + } + p = nested_p; + *inout_errorReported = TRUE; + } else { + /* Copy the initial '$' of the undefined expression, + * thereby deferring expansion of the expression, but + * expand nested expressions if already possible. + * See unit-tests/varparse-undef-partial.mk. */ + Buf_AddByte(buf, *p); + p++; + } } else { - /* Copy the initial '$' of the undefined expression, - * thereby deferring expansion of the expression, but - * expand nested expressions if already possible. - * See unit-tests/varparse-undef-partial.mk. */ - Buf_AddByte(buf, *p); - p++; + p = nested_p; + Buf_AddStr(buf, val.str); } - } else { - p = nested_p; - Buf_AddStr(buf, val); - } - free(val_freeIt); + FStr_Done(&val); + + *pp = p; +} + +/* + * Skip as many characters as possible -- either to the end of the string + * or to the next dollar sign (variable expression). + */ +static void +VarSubstPlain(const char **pp, Buffer *res) +{ + const char *p = *pp; + const char *start = p; - *pp = p; + for (p++; *p != '$' && *p != '\0'; p++) + continue; + Buf_AddBytesBetween(res, start, p); + *pp = p; } -/* Expand all variable expressions like $V, ${VAR}, $(VAR:Modifiers) in the +/* + * Expand all variable expressions like $V, ${VAR}, $(VAR:Modifiers) in the * given string. * * Input: * str The string in which the variable expressions are * expanded. * ctxt The context in which to start searching for * variables. The other contexts are searched as well. * eflags Special effects during expansion. */ VarParseResult Var_Subst(const char *str, GNode *ctxt, VarEvalFlags eflags, char **out_res) { - const char *p = str; - Buffer buf; /* Buffer for forming things */ - - /* Set true if an error has already been reported, - * to prevent a plethora of messages when recursing */ - /* XXX: Why is the 'static' necessary here? */ - static Boolean errorReported; - - Buf_Init(&buf); - errorReported = FALSE; - - while (*p != '\0') { - if (p[0] == '$' && p[1] == '$') { - /* A dollar sign may be escaped with another dollar sign. */ - if (save_dollars && (eflags & VARE_KEEP_DOLLAR)) - Buf_AddByte(&buf, '$'); - Buf_AddByte(&buf, '$'); - p += 2; - - } else if (p[0] == '$') { - VarSubstNested(&p, &buf, ctxt, eflags, &errorReported); - - } else { - /* - * Skip as many characters as possible -- either to the end of - * the string or to the next dollar sign (variable expression). - */ - const char *plainStart = p; - - for (p++; *p != '$' && *p != '\0'; p++) - continue; - Buf_AddBytesBetween(&buf, plainStart, p); + const char *p = str; + Buffer res; + + /* Set true if an error has already been reported, + * to prevent a plethora of messages when recursing */ + /* XXX: Why is the 'static' necessary here? */ + static Boolean errorReported; + + Buf_Init(&res); + errorReported = FALSE; + + while (*p != '\0') { + if (p[0] == '$' && p[1] == '$') + VarSubstDollarDollar(&p, &res, eflags); + else if (p[0] == '$') + VarSubstExpr(&p, &res, ctxt, eflags, &errorReported); + else + VarSubstPlain(&p, &res); } - } - *out_res = Buf_DestroyCompact(&buf); - return VPR_OK; + *out_res = Buf_DestroyCompact(&res); + return VPR_OK; } /* Initialize the variables module. */ void Var_Init(void) { - VAR_INTERNAL = GNode_New("Internal"); - VAR_GLOBAL = GNode_New("Global"); - VAR_CMDLINE = GNode_New("Command"); + VAR_INTERNAL = GNode_New("Internal"); + VAR_GLOBAL = GNode_New("Global"); + VAR_CMDLINE = GNode_New("Command"); } /* Clean up the variables module. */ void Var_End(void) { - Var_Stats(); + Var_Stats(); } void Var_Stats(void) { - HashTable_DebugStats(&VAR_GLOBAL->context, "VAR_GLOBAL"); + HashTable_DebugStats(&VAR_GLOBAL->vars, "VAR_GLOBAL"); } /* Print all variables in a context, sorted by name. */ void Var_Dump(GNode *ctxt) { - Vector /* of const char * */ vec; - HashIter hi; - size_t i; - const char **varnames; + Vector /* of const char * */ vec; + HashIter hi; + size_t i; + const char **varnames; - Vector_Init(&vec, sizeof(const char *)); + Vector_Init(&vec, sizeof(const char *)); - HashIter_Init(&hi, &ctxt->context); - while (HashIter_Next(&hi) != NULL) - *(const char **)Vector_Push(&vec) = hi.entry->key; - varnames = vec.items; + HashIter_Init(&hi, &ctxt->vars); + while (HashIter_Next(&hi) != NULL) + *(const char **)Vector_Push(&vec) = hi.entry->key; + varnames = vec.items; - qsort(varnames, vec.len, sizeof varnames[0], str_cmp_asc); + qsort(varnames, vec.len, sizeof varnames[0], str_cmp_asc); - for (i = 0; i < vec.len; i++) { - const char *varname = varnames[i]; - Var *var = HashTable_FindValue(&ctxt->context, varname); - debug_printf("%-16s = %s\n", varname, Buf_GetAll(&var->val, NULL)); - } + for (i = 0; i < vec.len; i++) { + const char *varname = varnames[i]; + Var *var = HashTable_FindValue(&ctxt->vars, varname); + debug_printf("%-16s = %s\n", + varname, Buf_GetAll(&var->val, NULL)); + } - Vector_Done(&vec); + Vector_Done(&vec); }