![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / make
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.94 / (download) - annotate - [select for diffs], Mon Sep 4 11:35:11 2023 UTC (8 months, 2 weeks ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
HEAD
Changes since 1.93: +1 -2 lines
Diff to previous 1.93 (colored)
GC old code that was originally implemented to facilitate adoption by other BSDs, which never happened, so make things simpler for further development. Ditches config.h entirely since it gets reduced to 2 defines. okay tb@
Revision 1.93 / (download) - annotate - [select for diffs], Fri Feb 17 17:59:36 2023 UTC (15 months ago) by miod
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE,
OPENBSD_7_3
Changes since 1.92: +3 -5 lines
Diff to previous 1.92 (colored)
Remove unused variables; ok millert@
Revision 1.92 / (download) - annotate - [select for diffs], Mon Dec 26 19:16:02 2022 UTC (16 months, 3 weeks ago) by jmc
Branch: MAIN
Changes since 1.91: +2 -2 lines
Diff to previous 1.91 (colored)
spelling fixes; from paul tagliamonte amendments to his diff are noted on tech
Revision 1.91 / (download) - annotate - [select for diffs], Mon Jan 13 13:54:44 2020 UTC (4 years, 4 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7
Changes since 1.90: +3 -4 lines
Diff to previous 1.90 (colored)
introduce a "Buf_Reinit" function for handling static buffers that can be reused throughout running make. Instead of recreating buffers of dubious appropriate size, have one single buffer for various stages of parsing.
Revision 1.90 / (download) - annotate - [select for diffs], Sat Dec 21 15:29:25 2019 UTC (4 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.89: +2 -2 lines
Diff to previous 1.89 (colored)
rename a few variable/functions to have better names. adjust comments to be more meaningful reorder predecessors/successors fields in an order that makes more sense to me. okay millert@
Revision 1.89 / (download) - annotate - [select for diffs], Mon Jul 24 12:07:46 2017 UTC (6 years, 9 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2
Changes since 1.88: +7 -7 lines
Diff to previous 1.88 (colored)
GC old cruft. noticed and patch Michael W. Bombardieri
Revision 1.88 / (download) - annotate - [select for diffs], Fri Jul 21 09:29:42 2017 UTC (6 years, 9 months ago) by espie
Branch: MAIN
Changes since 1.87: +6 -2 lines
Diff to previous 1.87 (colored)
fix two nasty out-of-bound accesses that killed (sporadically mk38 and mk38bis. prodded by bluhm@, okay bluhm@
Revision 1.87 / (download) - annotate - [select for diffs], Fri Oct 21 16:12:38 2016 UTC (7 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE,
OPENBSD_6_1
Changes since 1.86: +3 -3 lines
Diff to previous 1.86 (colored)
small obvious cleanups: - remove a lot of unnecessary casts - zap extra param that's no longer needed - add proper prototype and make function static okay natano@
Revision 1.86 / (download) - annotate - [select for diffs], Fri Dec 11 21:37:03 2015 UTC (8 years, 5 months ago) by mmcc
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9
Changes since 1.85: +5 -5 lines
Diff to previous 1.85 (colored)
Use %zu to print size_t's rather than casting to u_long. ok espie@
Revision 1.85 / (download) - annotate - [select for diffs], Fri Jan 16 15:36:29 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE,
OPENBSD_5_8,
OPENBSD_5_7_BASE,
OPENBSD_5_7
Changes since 1.84: +1 -2 lines
Diff to previous 1.84 (colored)
switch to <limits.h>; ok millert
Revision 1.84 / (download) - annotate - [select for diffs], Thu Jan 15 22:08:41 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
Changes since 1.83: +1 -9 lines
Diff to previous 1.83 (colored)
If some mythical system lacks PATH_MAX, do not set it to MAXPATHLEN+1 ok millert
Revision 1.83 / (download) - annotate - [select for diffs], Mon May 12 19:11:19 2014 UTC (10 years ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE,
OPENBSD_5_6
Changes since 1.82: +3 -3 lines
Diff to previous 1.82 (colored)
adjust to ohash being in libutil now, and to the interface changes. fix potential integer overflows in memory allocation (mostly for pedagogical purposes, these are unlikely to overflow in practice) move the rest of lst.lib stuff into its own directory.
Revision 1.82 / (download) - annotate - [select for diffs], Fri Nov 22 15:47:35 2013 UTC (10 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE,
OPENBSD_5_5
Changes since 1.81: +6 -6 lines
Diff to previous 1.81 (colored)
wrappers for is*/to* that make damn sure their arguments are cast to unsigned chars. okay deraadt@
Revision 1.81 / (download) - annotate - [select for diffs], Tue Apr 23 14:32:53 2013 UTC (11 years ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE,
OPENBSD_5_4
Changes since 1.80: +12 -12 lines
Diff to previous 1.80 (colored)
remove TIMESTAMP abstraction layer, prodded by theo. while there, clean up includes. use strtoll for ar timestamps (pretty much unused in reality, more standard conforming than anything) use idea from Todd to adapt to time_t being 32 bits OR 64 bits (pedantically correct: INT_MIN would work just fine up to 1910 or so...) okay millert@, gone thru a make build.
Revision 1.80 / (download) - annotate - [select for diffs], Tue Oct 2 10:29:30 2012 UTC (11 years, 7 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE,
OPENBSD_5_3
Changes since 1.79: +1 -136 lines
Diff to previous 1.79 (colored)
more changes, discussed and tested by various people. - put back some job control, turns out it's necessary when we don't run a shell. - zap old #ifdef CLEANUP code... probably doesn't even compile. - kill most of the OP_LIB code. Just keep a wee little bit for compatibility (deprecated .LIBS and .INCLUDES, warns for weird dependencies instead of erroring out). - much improved debugging and -p output: sort variables, targets, rules, output stuff in a nicer format mimicing input. - better error message when no command is found, explain where the target comes from. - sort final error list by file. - show system files in errors as <bsd.prog.mk> - reincorporate random delay, that was dropped - optimize siginfo output by not regenerating the whole string each time. - finish zapping old LocationInfo field that's no longer used.
Revision 1.79 / (download) - annotate - [select for diffs], Mon Jul 19 19:46:43 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE,
OPENBSD_5_2,
OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8
Changes since 1.78: +1 -2 lines
Diff to previous 1.78 (colored)
Correct $OpenBSD$ stuff
Revision 1.78 / (download) - annotate - [select for diffs], Mon Jul 19 19:30:37 2010 UTC (13 years, 10 months ago) by espie
Branch: MAIN
Changes since 1.77: +1 -1 lines
Diff to previous 1.77 (colored)
two small changes:
- allow variables in SysV modifiers, as requested by matthieu@
(since recursive variables are an extension, this just extends the
extension)
- variation on :Q called :QL (quote list), which does quote every character
EXCEPT for whitespace. e.g.,
toto:
@for i in ${VAR:QL} ...
Revision 1.77 / (download) - annotate - [select for diffs], Wed Feb 3 20:45:44 2010 UTC (14 years, 3 months ago) by miod
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE,
OPENBSD_4_7
Changes since 1.76: +5 -1 lines
Diff to previous 1.76 (colored)
Add a new default variable in Makefile context, MACHINE_CPU. Its value is decided at compile-time and is either MACHINE_CPU from <machine/param.h> if it is defined, or the same value as MACHINE_ARCH otherwise. This will be used to allow ports with suffixes to their canonical MACHINE_ARCH to provide this canonical name as MACHINE_CPU, and in turn to let Makefiles do TRT. ok kettenis@
Revision 1.76 / (download) - annotate - [select for diffs], Sun Aug 16 09:53:43 2009 UTC (14 years, 9 months ago) by espie
Branch: MAIN
Changes since 1.75: +1 -1 lines
Diff to previous 1.75 (colored)
modify timestamp handling to grab current time instead of relying on a stale timestamp. all those diffs sent to people ages ago, who didn't answer, except for Theo, who said he ran it with no issues, so let's get this in...
Revision 1.75 / (download) - annotate - [select for diffs], Sat Nov 17 16:39:45 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3
Changes since 1.74: +4 -4 lines
Diff to previous 1.74 (colored)
simplify dynamic variable handling a great deal: first remove all usage of Varq_Append by building the string directly. then replace `common' handling with specialized handling for dynamic strings (since they no longer need a buffer). Finally, identify the place where the variable value needs to be copied because it's going to be free'd or erased soon, and finally, use simple char* pointers. Shaves about 80 bytes off every gnode structure, and kills quite a few unnecessary malloc()s as well.
Revision 1.74 / (download) - annotate - [select for diffs], Sat Nov 10 12:51:40 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.73: +3 -3 lines
Diff to previous 1.73 (colored)
rename make -> must_make, made -> built_status to make them easier to find in source files.
Revision 1.73 / (download) - annotate - [select for diffs], Sat Nov 3 15:30:04 2007 UTC (16 years, 6 months ago) by deraadt
Branch: MAIN
Changes since 1.72: +3 -1 lines
Diff to previous 1.72 (colored)
#ifdef stuff that is only used under #ifdef; ok espie
Revision 1.72 / (download) - annotate - [select for diffs], Fri Nov 2 17:27:24 2007 UTC (16 years, 6 months ago) by espie
Branch: MAIN
Changes since 1.71: +3 -19 lines
Diff to previous 1.71 (colored)
Work done at p2k7. This is a really big step towards getting parallel make to work. Note that this is not yet complete. There are still a few `details' to fix before this works 100%. Specifically: sequential make (compat) and parallel make don't use the same engine, and the parallel engine still has a few limitations. For instance, some known issues: - parallel make does not deal with .phony targets correctly all the time. - some errors are deadly in parallel make mode. - parallel make NEEDS way more sturdy correspondance of file system paths and target names, since it often needs to match dependencies to targets before the corresponding files exist. - some local variables like $* get set in a bogus way in some cases. - suffix handling has issues, especially related to the NULL suffix. So, if you find stuff that does NOT yet work with parallel make, don't go blindly try to fix the Makefile. It's very likely you might have stumbled into a make bug. (unless you really, really, understand Makefiles, DON'T GO CHANGING THEM YET). Tested by lots of people, thanks go to miod@, and robert@ among other people. Quick summary of what this does: - remove `saving commands' extension (it's not really usable, nor used) - move compat job runner and parallel interrupt handling into engine.c - tweak the code so that both compat and parallel mode use the same job runner and the same interrupt handling. Remove the other one. - optimize job runner so that, in parallel mode, the last command does not fork if we can avoid it (as it's already running in a sub shell). - scrape all the code that dealt with creating shell scripts from commands. - scrape all the code that dealt with recognizing special sequences in command output to print/not print output. - fix the parallel job pipe to not keep around file descriptors that are not needed. - replace the parallel job buffering with a nicer one, that deals with non-blocking descriptors to try to agregate as much output from one job in one go (greed) to unconfuse the users. - create two pipes per job, so that stdout and stderr stay separate. - make job token printing a debug option. - always use the parallel job-runner to `execute' commands, even if we just print them out. - store list of errors encountered during parallel make running, and print them on exit, so that we know what went wrong. - add a dirty hack to targ.c to deal with paths produced by gccmakedep.
Revision 1.71 / (download) - annotate - [select for diffs], Mon Sep 17 12:50:59 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.70: +1 -15 lines
Diff to previous 1.70 (colored)
always define the svr4namelist. Doesn't hurt, even if we don't use it.
Revision 1.70 / (download) - annotate - [select for diffs], Mon Sep 17 10:06:44 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.69: +132 -139 lines
Diff to previous 1.69 (colored)
fix the arch code mostly. - stop using sprintf for code that can use our buffers. - stop modifying parsed line, rely on Var_Substi instead. to do that, we need to go through an intermediate routine that uses one single buffer to build archive names. also introduce an add_archive_node function that makes things way simpler. also rename a few variables.
Revision 1.69 / (download) - annotate - [select for diffs], Mon Sep 17 09:28:36 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.68: +29 -29 lines
Diff to previous 1.68 (colored)
kill extra spaces at end of line
Revision 1.68 / (download) - annotate - [select for diffs], Sun Sep 16 12:30:35 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.67: +2 -2 lines
Diff to previous 1.67 (colored)
rename dirSearchPath -> defaultPath, and openDirectories -> knownDirectories
Revision 1.67 / (download) - annotate - [select for diffs], Sun Sep 16 12:25:12 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.66: +35 -35 lines
Diff to previous 1.66 (colored)
minor reindent issues
Revision 1.66 / (download) - annotate - [select for diffs], Sun Sep 16 12:09:36 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.65: +2 -2 lines
Diff to previous 1.65 (colored)
rename Targ_FmtTime into time_to_string and move it, as it's not related to target nodes at all (reduces modules inter-dependencies)
Revision 1.65 / (download) - annotate - [select for diffs], Sun Sep 16 11:29:34 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.64: +2 -15 lines
Diff to previous 1.64 (colored)
reuse free_hash
Revision 1.64 / (download) - annotate - [select for diffs], Sun Sep 16 11:27:05 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.63: +619 -593 lines
Diff to previous 1.63 (colored)
reindent arch.c
Revision 1.63 / (download) - annotate - [select for diffs], Sun Sep 16 10:14:26 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.62: +2 -1 lines
Diff to previous 1.62 (colored)
cut up dir.c into dir.c/direxpand.c as there is very little interface between two modules that do different things.
Revision 1.62 / (download) - annotate - [select for diffs], Sun Sep 16 09:49:24 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.61: +1 -5 lines
Diff to previous 1.61 (colored)
more dead code: we always define LIBRARIES and INCLUDES
Revision 1.61 / (download) - annotate - [select for diffs], Sun Sep 16 09:46:14 2007 UTC (16 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.60: +0 -0 lines
Diff to previous 1.60 (colored)
remove dead code: #define RECHECK is always on
Revision 1.60 / (download) - annotate - [select for diffs], Mon Jul 30 09:51:53 2007 UTC (16 years, 9 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE,
OPENBSD_4_2
Changes since 1.59: +0 -0 lines
Diff to previous 1.59 (colored)
everywhere except in Var_Parse, we always add/append variables to the VAR_GLOBAL context, so make it the common case: rename the basic functions to Var_Set_with_ctxt/Var_Append_with_ctxt, define Var_Set and Var_Append as macros that specify VAR_GLOBAL, and use these. okay miod@
Revision 1.59 / (download) - annotate - [select for diffs], Tue Jul 24 18:58:48 2007 UTC (16 years, 9 months ago) by espie
Branch: MAIN
Changes since 1.58: +0 -0 lines
Diff to previous 1.58 (colored)
simplify computations in the var module: instead of advancing a char * and keeping track of a length, we just advance the char *, and ditch the length. We can still get the length at the end of the top-level functions to satisfy existing interfaces. Much simpler code, less error-prone. Okay millert@
Revision 1.58 / (download) - annotate - [select for diffs], Tue Jul 24 18:56:15 2007 UTC (16 years, 9 months ago) by espie
Branch: MAIN
Changes since 1.57: +0 -0 lines
Diff to previous 1.57 (colored)
move the code that grabs a value in Var_Parse in its own function, get_expanded_value. Extend the code a bit to be much more thorough in case of a recursive expansion: shows exactly the cycle of variable names involved. okay millert@
Revision 1.57 / (download) - annotate - [select for diffs], Tue Jul 24 18:52:47 2007 UTC (16 years, 9 months ago) by espie
Branch: MAIN
Changes since 1.56: +3 -8 lines
Diff to previous 1.56 (colored)
change Var_ParseSkip API to increment the position instead of returning a length, simplifies code. (warns a bit, symptom of some further issues to fix). okay millert@
Revision 1.56 / (download) - annotate - [select for diffs], Tue Mar 20 03:50:39 2007 UTC (17 years, 2 months ago) by tedu
Branch: MAIN
Changes since 1.55: +3 -3 lines
Diff to previous 1.55 (colored)
remove some bogus *p tests from charles longeau ok deraadt millert
Revision 1.55 / (download) - annotate - [select for diffs], Fri Jan 20 23:10:19 2006 UTC (18 years, 4 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE,
OPENBSD_4_1,
OPENBSD_4_0_BASE,
OPENBSD_4_0,
OPENBSD_3_9_BASE,
OPENBSD_3_9
Changes since 1.54: +2 -2 lines
Diff to previous 1.54 (colored)
use stdint.h where appropriate. okay millert@
Revision 1.54 / (download) - annotate - [select for diffs], Wed Apr 7 13:11:35 2004 UTC (20 years, 1 month ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7,
OPENBSD_3_6_BASE,
OPENBSD_3_6
Changes since 1.53: +116 -131 lines
Diff to previous 1.53 (colored)
ISO function declarations, trim a few comments, rename a few variables to more explicit/more consistent names. okay otto@
Revision 1.53 / (download) - annotate - [select for diffs], Tue Jun 3 02:56:11 2003 UTC (20 years, 11 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE,
OPENBSD_3_5,
OPENBSD_3_4_BASE,
OPENBSD_3_4
Changes since 1.52: +2 -6 lines
Diff to previous 1.52 (colored)
Remove the advertising clause in the UCB license which Berkeley rescinded 22 July 1999. Proofed by myself and Theo.
Revision 1.52 / (download) - annotate - [select for diffs], Sun Apr 6 22:47:14 2003 UTC (21 years, 1 month ago) by espie
Branch: MAIN
Changes since 1.51: +8 -5 lines
Diff to previous 1.51 (colored)
get rid of some strcpy/sprintf. ok krw@, matthieu@, deraadt@
Revision 1.51 / (download) - annotate - [select for diffs], Wed Jan 30 18:40:26 2002 UTC (22 years, 3 months ago) by matthieu
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE,
OPENBSD_3_3,
OPENBSD_3_2_BASE,
OPENBSD_3_2,
OPENBSD_3_1_BASE,
OPENBSD_3_1
Changes since 1.50: +2 -3 lines
Diff to previous 1.50 (colored)
use defined(__ELF__) instead of a list of ELF architectures from which sparc64 was missing. This fixes a bug with ELF static libraries on sparc64
Revision 1.50 / (download) - annotate - [select for diffs], Wed Sep 19 10:58:07 2001 UTC (22 years, 8 months ago) by mpech
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE,
OPENBSD_3_0
Changes since 1.49: +2 -2 lines
Diff to previous 1.49 (colored)
occured->occurred idea from deraadt@ via NetBSD millert@ ok p.s. Next commit will fix a typo in the sys/
Revision 1.49 / (download) - annotate - [select for diffs], Thu Jun 7 13:53:22 2001 UTC (22 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.48: +3 -4 lines
Diff to previous 1.48 (colored)
Better warning fix, in line with the rest of the code (__attribute((__unused__)) denotes parameters that MAY be unused in the code, e.g., it's mostly a `shut up warnings' device).
Revision 1.48 / (download) - annotate - [select for diffs], Tue Jun 5 11:59:10 2001 UTC (22 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.47: +13 -5 lines
Diff to previous 1.47 (colored)
Use Str_concat instead of fixed buffers and snprintf in building paths. Replace MAXPATHLEN with PATH_MAX (synch with op-make). ok naddy@
Revision 1.47 / (download) - annotate - [select for diffs], Wed May 30 00:43:00 2001 UTC (22 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.46: +7 -2 lines
Diff to previous 1.46 (colored)
-Wall cleanup, mostly useless otherwise
Revision 1.46 / (download) - annotate - [select for diffs], Tue May 29 12:53:38 2001 UTC (22 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.45: +2 -1 lines
Diff to previous 1.45 (colored)
Take includes out of lst.h, re-add what's needed to separate files. Removes remaining lint stuff from lst.lib.
Revision 1.45 / (download) - annotate - [select for diffs], Wed May 23 12:34:39 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.44: +83 -222 lines
Diff to previous 1.44 (colored)
Mostly clean-up: - cut up those huge include files into separate interfaces for all modules. Put the interface documentation there, and not with the implementation. - light-weight includes for needed concrete types (lst_t.h, timestamp_t.h). - cut out some more logically separate parts: cmd_exec, varname, parsevar, timestamp. - put all error handling functions together, so that we will be able to clean them up. - more systematic naming: functioni to handle interval, function to handle string. - put the init/end code apart to minimize coupling. - kill weird types like ReturnStatus and Boolean. Use standard bool (with a fallback for non-iso systems) - better interface documentation for lots of subsystems. As a result, make compilation goes somewhat faster (5%, even considering the largish BSD copyrights to read). The corresponding preprocessed source goes down from 1,5M to 1M. A few minor code changes as well: Parse_DoVar is no longer destructive. Parse_IsVar functionality is folded into Parse_DoVar (as it knows what an assignment is), a few more interval handling functions. Avoid calling XXX_End when they do nothing, just #define XXX_End to nothing. Parse_DoVar is slightly more general: it will handle compound assignments as long as they make sense, e.g., VAR +!= cmd will work. As a side effect, VAR++=value now triggers an error (two + in assignment). - this stuff doesn't occur in portable Makefiles. - writing VAR++ = value or VAR+ +=value disambiguates it. - this is a good thing, it uncovered a bug in bsd.port.mk. Tested by naddy@. Okayed millert@. I'll handle the fallback if there is any. This went through a full make build anyways, including isakmpd (without mickey's custom binutils, as he didn't see fit to share it with me).
Revision 1.44 / (download) - annotate - [select for diffs], Thu May 3 13:41:00 2001 UTC (23 years ago) by espie
Branch: MAIN
Changes since 1.43: +243 -318 lines
Diff to previous 1.43 (colored)
Synch with my current work.
Numerous changes:
- generate can build several tables
- style cleanup
- statistics code
- use variable names throughout (struct Name)
- recursive variables everywhere
- faster parser (pass buffer along instead of allocating multiple copies)
- correct parser. Handles comments everywhere, and ; correctly
- more string intervals
- simplified dir.c, less recursion.
- extended for loops
- sinclude()
- finished removing extra junk from Lst_*
- handles ${@D} and friends in a simpler way
- cleaned up and modular VarModifiers handling.
- recognizes some gnu Makefile usages and errors out about them.
Additionally, some extra functionality is defined by FEATURES. The set of
functionalities is currently hardcoded to OpenBSD defaults, but this may
include support for some NetBSD extensions, like ODE modifiers.
Backed by miod@ and millert@, who finally got sick of my endless patches...
Revision 1.43 / (download) - annotate - [select for diffs], Fri Mar 2 16:57:26 2001 UTC (23 years, 2 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE,
OPENBSD_2_9
Changes since 1.42: +25 -25 lines
Diff to previous 1.42 (colored)
Use the ohash_* that's now in libc.
Revision 1.42 / (download) - annotate - [select for diffs], Mon Nov 27 20:37:16 2000 UTC (23 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.41: +116 -114 lines
Diff to previous 1.41 (colored)
This patch fixes ArchFindMember so that it handles SVR4 members similarly to read_archive. Note we no longer bother seeking back to the start of the header, as only ArchTouch accesses that header, and can do the seek itself. With this, arch handling should be working, more or less. thanks to Todd, Miod, Naddy for reviewing those patches.
Revision 1.41 / (download) - annotate - [select for diffs], Mon Nov 27 20:35:27 2000 UTC (23 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.40: +68 -54 lines
Diff to previous 1.40 (colored)
This does fix some nasty issues: ar field members are NOT null-terminated. Hence, read_archive must be very careful to parse stuff correctly: don't use str* when mem* are appropriate, copy numeric fields and ensure they're terminated...
Revision 1.40 / (download) - annotate - [select for diffs], Mon Nov 27 18:58:10 2000 UTC (23 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.39: +86 -82 lines
Diff to previous 1.39 (colored)
We take of the SVR4 archive handling data structure from our archive, and put it into a specific structure (it is wasteful to keep lugging SVR4 structures once an archive is parsed). By tweaking read_archive slightly, we can achieve a nicer interface to ArchSVR4Entry. Note a bug in make: ArchFindMember does (currently) not use the SVR4 code, hence some archive members won't be found in non-caching mode...
Revision 1.39 / (download) - annotate - [select for diffs], Mon Nov 27 18:43:52 2000 UTC (23 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.38: +26 -32 lines
Diff to previous 1.38 (colored)
Factorise duplicated code involved in touching archives.
Revision 1.38 / (download) - annotate - [select for diffs], Fri Nov 24 14:38:57 2000 UTC (23 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.37: +158 -159 lines
Diff to previous 1.37 (colored)
As it stands now, arch.c does not work. Its main failing is that ar headers are NOT null terminated. This code is atrocious. This change starts cleaning that up. Replace the list of cached archives with a hash, streamline the logic of ArchMTimeMember, by taking out the actual function that does the reading (read_archive). More fixes to come.
Revision 1.37 / (download) - annotate - [select for diffs], Fri Nov 24 14:36:33 2000 UTC (23 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.36: +45 -62 lines
Diff to previous 1.36 (colored)
Change the time stamp interface to use an abstract datatype. Define two possible interfaces: the classic one, and the new one (used where available) that depends on timespec. Better granularity, make is now able to distinguish between files that were built during the same second.
Revision 1.36 / (download) - annotate - [select for diffs], Fri Oct 13 08:30:49 2000 UTC (23 years, 7 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_8_BASE,
OPENBSD_2_8
Changes since 1.35: +5 -11 lines
Diff to previous 1.35 (colored)
Fix Arch_MemMTime (previous change I did was bogus)
Revision 1.35 / (download) - annotate - [select for diffs], Thu Sep 14 13:56:14 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.34: +125 -95 lines
Diff to previous 1.34 (colored)
This kills the last old hashing table, in arch.c Slight optimizations: instead of storing archive members, just keep the modification time, as we don't care for the rest of the archive information. Lazily compute mtime, stash ascii date instead, and convert to mtime when needed (storing an out_of_date value to mark the unconverted values). Archive handling is atrocious and need some clean-up. Thanks to miod@ who took the time to review those patches.
Revision 1.34 / (download) - annotate - [select for diffs], Thu Sep 14 13:52:41 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.33: +7 -10 lines
Diff to previous 1.33 (colored)
Introduce a few macros to handle timestamps in an abstract way. Replace the time stamp hash in dir.c with an open hashing structure. In doing so, remove some nasty casts, simplify code a bit: Dir_MTime can return a modification time, since make does not make a distinction between out-of-date and non-existent files.
Revision 1.33 / (download) - annotate - [select for diffs], Thu Sep 14 13:46:44 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.32: +4 -2 lines
Diff to previous 1.32 (colored)
Replace the old hash used to hold file names within a directory with open hashing. An interesting optimization is that the open hashing interface is more fine-grained, hence we can compute the correct hash value at the start of Dir_FindFile, and reuse it for each hash structure into which we look (the effect is measurable on large directories along with objdir/VPATH). Remove a few unnecessary Lst_Open/Lst_Close that serve no purpose except obfuscating the code. The interface to dir.h changes slightly, hence tedious includes changes...
Revision 1.32 / (download) - annotate - [select for diffs], Thu Sep 14 13:32:05 2000 UTC (23 years, 8 months ago) by espie
Branch: MAIN
Changes since 1.31: +11 -11 lines
Diff to previous 1.31 (colored)
Some systematic clean-up. - UNUSED macro that expands to __attribute__((unused)) for gcc - move rcsid around so that they can be tagged UNUSED. - activate -Wunused. - use UNUSED instead of kludgy junk for function arguments. - add extern to all extern prototypes. - update comments in lst.h. - clean up var.c a little bit, constifying arguments, updating comments...
Revision 1.31 / (download) - annotate - [select for diffs], Fri Jun 23 16:20:01 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.30: +4 -4 lines
Diff to previous 1.30 (colored)
Once those special variable are taken care of, other Var functions can take the GNode's context directly. We rename that special Lst to `SymTable *' in prevision of things to come. Along the line, we lose the special GNodes affected to VAR_CMD, VAR_GLOBAL, VAR_ENV, which become simple Lsts... This is not a problem, except when getting to a context's name for debugging (handled very nicely by offsetof). Again, this is a preparatory patch, which does not gain anything except for cleaning up issues... Reviewed by millert@ and miod@, like the previous patch
Revision 1.30 / (download) - annotate - [select for diffs], Fri Jun 23 16:18:08 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.29: +8 -8 lines
Diff to previous 1.29 (colored)
Start of variable fixes and speed-ups. This patch may seem a bit non-sensical at first. It simply introduces some new interface. Specifically, recognizes that some variable names (.TARGET/$@, .OODATE/$?, .ALLSRC/$>, .IMPSRC/$<, .PREFIX/$*, .ARCHIVE/$!, .MEMBER/$%) are `special' (the actual variables which are local to a target, e.g. GNode). Currently, The Varq functions (for Varquick access) are only stubs to the normal functions. This fixes a very important detail before proceeding to turn variable lists into hash tables: if every GNode holds a hash table, initialization times for those will be very costly. But generic GNodes only hold those seven special variables... which can be stored directly into a small array; the only general cases are the environment, the command line and global variables.
Revision 1.29 / (download) - annotate - [select for diffs], Fri Jun 23 16:15:49 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.28: +5 -8 lines
Diff to previous 1.28 (colored)
Trivial consequences of the previous list changes: - audit code for Lst_Datum, it's never applied to an empty pointer, so check can be removed -> turn into a macro, - Lst_First, Lst_Last can become macro as well - specialized version of Lst_Succ (Lst_Adv) to use in loops where it cannot fail, - Lst_Open can no longer fail. Trim down corresponding code. Reviewed millert@, miod@
Revision 1.28 / (download) - annotate - [select for diffs], Sat Jun 17 14:38:13 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.27: +20 -19 lines
Diff to previous 1.27 (colored)
This patch introduces a distinction between Lst_Init (constructor) and Lst_New (allocation + construction) Lst_Destroy (destructor) and Lst_Delete (deallocation + destruction), and uses that to turn most dynamic allocation of lists (Lst pointers) into static structures (LIST). Most of this is mundane, except for allGNs in targ.c, where the code must be checked to verify that Targ_Init is called soon enough. Lst_New is a temporary addition. All lists will soon be static. Reviewed by millert@, like the previous patch.
Revision 1.27 / (download) - annotate - [select for diffs], Sat Jun 10 01:41:05 2000 UTC (23 years, 11 months ago) by espie
Branch: MAIN
Changes since 1.26: +17 -18 lines
Diff to previous 1.26 (colored)
Clean-up patch: use `void *' instead of old-fashioned ClientData/Address.
Revision 1.26 / (download) - annotate - [select for diffs], Sun Mar 26 16:21:32 2000 UTC (24 years, 1 month ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE,
OPENBSD_2_7
Changes since 1.25: +8 -8 lines
Diff to previous 1.25 (colored)
Remove idiotic, braindead casts T* -> void* They serve no purpose, except hiding potential bugs. In particular, remove (ClientData) cast from macro, showing potentially troublesome use of Hashes to store time_t.
Revision 1.25 / (download) - annotate - [select for diffs], Wed Feb 2 13:47:46 2000 UTC (24 years, 3 months ago) by espie
Branch: MAIN
Changes since 1.24: +26 -23 lines
Diff to previous 1.24 (colored)
Bug-fix: make should behave sensibly when presented with negative times... - let *_MTime return booleans, as that's what they're used for, the time_t is set as a side effect. - use OUT_OF_DATE for a date starting point, set it at the origin of time.
Revision 1.24 / (download) - annotate - [select for diffs], Sat Jan 8 09:45:15 2000 UTC (24 years, 4 months ago) by espie
Branch: MAIN
Changes since 1.23: +4 -4 lines
Diff to previous 1.23 (colored)
Finish changing all Var_Parse arguments to size_t. Thanks to millert@ for reminding me.
Revision 1.23 / (download) - annotate - [select for diffs], Sun Dec 19 00:04:24 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.22: +3 -3 lines
Diff to previous 1.22 (colored)
Rearrange Lst_Find interface to conform better with other functions.
Revision 1.22 / (download) - annotate - [select for diffs], Sat Dec 18 21:58:07 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.21: +6 -6 lines
Diff to previous 1.21 (colored)
Nothing ever checks ReturnStatus on Lst_Insert, Lst_Append, Lst_AtFront, Lst_AtEnd, Lst_Concat, Lst_Remove, Lst_Replace. Don't bother returning one.
Revision 1.21 / (download) - annotate - [select for diffs], Sat Dec 18 21:56:07 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.20: +3 -4 lines
Diff to previous 1.20 (colored)
Lst_DeQueue already checks for empty lists.
Revision 1.20 / (download) - annotate - [select for diffs], Sat Dec 18 21:53:32 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.19: +7 -7 lines
Diff to previous 1.19 (colored)
NIL, NILGNODE, etc, are only glorified NULL. Get rid of them. Get rid of list.h, nothing uses it anyway.
Revision 1.19 / (download) - annotate - [select for diffs], Sat Dec 18 02:11:26 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.18: +4 -4 lines
Diff to previous 1.18 (colored)
make does not use circular lists, get rid of the extra weight.
Revision 1.18 / (download) - annotate - [select for diffs], Thu Dec 16 17:27:18 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.17: +4 -4 lines
Diff to previous 1.17 (colored)
Var_Subst is actually two distinct functions folded into one: split the function specific to for.c out, and give them more sensible arguments at the same time. This makes .for loop handling more efficient, as we have some heuristic to evaluate the size of the buffer needed...
Revision 1.17 / (download) - annotate - [select for diffs], Mon Dec 6 22:28:43 1999 UTC (24 years, 5 months ago) by espie
Branch: MAIN
Changes since 1.16: +6 -13 lines
Diff to previous 1.16 (colored)
Extra parameter no longer needed, ditch.
Revision 1.16 / (download) - annotate - [select for diffs], Tue Oct 5 22:06:23 1999 UTC (24 years, 7 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE,
OPENBSD_2_6
Changes since 1.15: +8 -2 lines
Diff to previous 1.15 (colored)
Efficiency patch from NetBSD: make spends time freeing data structures right before exiting. So don't bother. Keep the code inside #ifdef, so that it's still there if someone ever wants to use make code inside a library.
Revision 1.15 / (download) - annotate - [select for diffs], Tue Jun 1 17:54:31 1999 UTC (24 years, 11 months ago) by pefo
Branch: MAIN
Changes since 1.14: +3 -3 lines
Diff to previous 1.14 (colored)
Fix some mips -> __mips__ stuff.
Revision 1.14 / (download) - annotate - [select for diffs], Sat Dec 5 00:06:26 1998 UTC (25 years, 5 months ago) by espie
Branch: MAIN
CVS Tags: OPENBSD_2_5_BASE,
OPENBSD_2_5
Changes since 1.13: +32 -24 lines
Diff to previous 1.13 (colored)
Modifications from netbsd: - don't interfere with MACHINE/MACHINE_ARCH defines for bootstrap - type clean-up, time_t, and printing `unknown' ints - fix TARGET/MEMBER bug in archive rules - memmove... - cleaner Error handler. - reentrant brk_string - .MAKE env variable - preliminary scaffolding for .NOPATH Other improvements: - efree - shellneed streamlined - display Stop in .CURDIR after an error. - document most features and misfeatures. - add a few OpenBSD notes to the tutorial.
Revision 1.13 / (download) - annotate - [select for diffs], Mon Jul 13 00:41:34 1998 UTC (25 years, 10 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_4_BASE,
OPENBSD_2_4
Changes since 1.12: +8 -8 lines
Diff to previous 1.12 (colored)
Use SEEK_CUR as "whence" in fseek, not 1.
Revision 1.12 / (download) - annotate - [select for diffs], Thu Jul 2 20:47:25 1998 UTC (25 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)
Fix a bug where make gets confused by targets beginning with a period (``.'') and tried to do a suffix conversion, following a NULL pointer in the proccess. Also add some sanity checks so we don't blindly assume strchr returns non-NULL.
Revision 1.11 / (download) - annotate - [select for diffs], Mon Oct 13 14:47:14 1997 UTC (26 years, 7 months ago) by pefo
Branch: MAIN
CVS Tags: OPENBSD_2_3_BASE,
OPENBSD_2_3,
OPENBSD_2_2_BASE,
OPENBSD_2_2
Changes since 1.10: +4 -3 lines
Diff to previous 1.10 (colored)
powerpc ELF
Revision 1.10 / (download) - annotate - [select for diffs], Tue Jun 17 20:34:43 1997 UTC (26 years, 11 months ago) by kstailey
Branch: MAIN
Changes since 1.9: +25 -26 lines
Diff to previous 1.9 (colored)
(foo *)NULL -> NULL
Revision 1.9 / (download) - annotate - [select for diffs], Sat Nov 30 21:08:49 1996 UTC (27 years, 5 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE,
OPENBSD_2_1
Changes since 1.8: +58 -24 lines
Diff to previous 1.8 (colored)
Sync with NetBSD: - Merge in FreeBSD and Lite2 changes. - Fix bug where a non-archive target with a .a suffix would always be considered to be out of date, since it does not have a TOC. - Fix NetBSD PR #2930: declare missing variable.
Revision 1.8 / (download) - annotate - [select for diffs], Thu Oct 17 19:08:44 1996 UTC (27 years, 7 months ago) by niklas
Branch: MAIN
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)
Do not consider non-existent archives as up-to-date on non-a.out systems
Revision 1.7 / (download) - annotate - [select for diffs], Sat Sep 21 19:36:27 1996 UTC (27 years, 8 months ago) by niklas
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE,
OPENBSD_2_0
Changes since 1.6: +4 -3 lines
Diff to previous 1.6 (colored)
Do not look for a.out t.o.c sections in the mips-based ports
Revision 1.6 / (download) - annotate - [select for diffs], Mon Sep 2 16:04:07 1996 UTC (27 years, 8 months ago) by briggs
Branch: MAIN
Changes since 1.5: +166 -39 lines
Diff to previous 1.5 (colored)
Sync up with NetBSD:
(christos)
Fix bug reported by Greg Hudson where leaf (source only) nodes were
referenced only by their basename and not by their full pathname. This
breaks when .PATH or MAKEOBJDIR are used. There might be Makefiles
around that try to work around this bug by prepending ${.CURDIR} to
the sources, and they should be found and fixed. Also a lot of the gunk
in suff.c that was attempting to work around the same problem could be
removed.
(christos)
- Move -D flags from Makefile to config.h and explain what they do. Add
-Wall -Wno-unused to CFLAGS. Add new define SYSVVARSUB to enable SysV
style variable substitutions and enable them.
- Add SunOS style command substitutions via SUNSHCMD
- Fix core dump with '{variable = value'
(christos)
Fix bug where make will always exit with 0, even when one or more
parallel jobs failed. (Only affects parallel make code)
(christos)
Protect __P from being multiply defined (for systems that already
define it)
(christos) Add strdup() since ultrix is missing it.
From Larry Schwimmer <rosebud@cyclone.Stanford.EDU>
(christos) Add estrdup(), a checked version of strdup and use it.
(christos) Recognize SVR4 style long filename entries in archives.
(thorpej) Tidy up some RCS ids a bit.
Revision 1.5 / (download) - annotate - [select for diffs], Wed Jul 31 00:01:04 1996 UTC (27 years, 9 months ago) by niklas
Branch: MAIN
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)
RANLIBMAG should not be set on alphas, as make doesn't know ECOFF archives
Revision 1.4 / (download) - annotate - [select for diffs], Wed Mar 27 19:32:35 1996 UTC (28 years, 1 month ago) by niklas
Branch: MAIN
Changes since 1.3: +5 -3 lines
Diff to previous 1.3 (colored)
From NetBSD: merge of 960317
Revision 1.3 / (download) - annotate - [select for diffs], Thu Feb 22 22:24:43 1996 UTC (28 years, 3 months ago) by niklas
Branch: MAIN
Changes since 1.2: +16 -8 lines
Diff to previous 1.2 (colored)
From NetBSD: Support SVR4 style archives. Fix pr/1421 (from Matthew Green) and pr/1997 (from Jeff Thieleke). In ParseDoInclude(), make a temporary copy of the current file name while searching for ""-type include files, since the current file name might not be a writeable string.
Revision 1.2 / (download) - annotate - [select for diffs], Thu Dec 14 03:23:26 1995 UTC (28 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +9 -3 lines
Diff to previous 1.1 (colored)
from christos@netbsd:
Minor:
- ${.PREFIX} should never contain a full pathname
- Fixed gcc -Wall warnings
Major:
- compatMake is now FALSE. This means that we are now running in
full pmake mode:
* rules on dependency lines can be executed in parallel and or
out of sequence:
foo: bar baz
can fire the rule for baz before the rule for bar is fired.
To enforce bar to be fired before baz, another rule needs to be
added. [bar: baz]
* adjacent shell commands in a target are now executed by a single
invocation of the shell, not one invocation of the shell per line
(compatMake can be turned off using the -B flag)
- The -j flag now works... I.e. make -j 4 will fork up to four jobs in
parallel when it can. The target name is printed before each burst
of output caused by the target execution as '--- target ---', when j > 1
- I have changed all the Makefiles so that they work with make -j N, and
I have tested the whole netbsd by:
'make -j 4 cleandir; make -j 4 depend; make -j 4; make -j 4 install'
- I have not compiled or tested this version of make with -DREMOTE.
- Turn compat mode on by default. It gets turned off when the -j without
the -B flag is specified. [Thus you can use -j 1 to turn it off].
- Fix malloc -> emalloc as Gordon noted.
Updates for POSIX/SVR4 compiling:
arch.c: Don't require ranlib stuff. Not everybody has it.
dir.c: SunOS-4 != Solaris; change #ifdef sun to #if sun && !__svr4__
job.c, compat.c: Don't use 'union wait', use int and the W*() macros.
main.c: Check for uname() == -1; some unames return > 0...
util.c, job.c: Add signal() with BSD semantics for svr4, don't use bsd
sigmask and friends.
from cgd@netbsd:
pull in make.h. (PAlloc() now uses emalloc(), which is prototyped in
make.h. If the prototype is not in scope on the Alpha, I see lots
of "cast to pointer from integer of different size" warnings.)
Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:45:41 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)
initial import of NetBSD tree
Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:45:41 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN
Initial revision