d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
113,452 Commits 4 Branches 49 Tags 2 GiB
503e7ada08
Commit Graph

479 Commits

Author SHA1 Message Date
harti
503e7ada08 Style: Fix indentation. 2005-03-11 12:40:55 +00:00
harti
364f261bed Call ParseFinishLine() also for the last line in a file. This 
patch differs from the previous one in that it calls the function
only when a real file hits EOF. The bodies of .for loops are also
handled as files, but for these we don't want to end a dependency block
on the 'EOF' as in:

foo:
	do-this
.for ...
	do-something
.endfor
	do-more
 2005-03-11 11:29:39 +00:00
harti
6d878c5dc2 Back out the last commit. It turns out that this breaks more than 
it fixes. This should fix the buildworld breakage.
 2005-03-11 07:53:32 +00:00
harti
751b56b164 Constify Var_Dump and simplify it by inlining VarPrintVar. 2005-03-10 15:38:01 +00:00
harti
e98f139ac2 Call ParseFinishLine() for the last line of a file too. 2005-03-10 15:30:09 +00:00
harti
188f70d7e9 Reorganize Suff_EndTransform to be called only for nodes for 
which it is needed (transforms).
 2005-03-10 14:54:47 +00:00
harti
32e1481603 Style: fix function style before working on it (mainly intendation). 2005-03-10 10:16:03 +00:00
harti
ba42fcc409 Implement a new macro LST_NEXT which is like Lst_Succ but doesn't check 
for its argument to be non-NULL.
 2005-03-09 16:53:31 +00:00
harti
bb218a7c02 Split SuffExpandChildren into three functions: one that skips 
variables and expands archive specifications, one that expands
wild cards and a driver that loops over the children list and
expands each child if necessary replacing it with it's expansions.
 2005-03-09 16:51:43 +00:00
harti
633c8c538c Var_Subst() cannot return NULL so there is no reason to check 
for it.
 2005-03-09 07:53:03 +00:00
harti
1dd03a69ac Style: fix indentation of SuffExpandChildren before working on it. 2005-03-08 16:30:32 +00:00
harti
af76c1e1e3 Use Buf_Peel to get rid of a local variable. 2005-03-08 14:37:47 +00:00
harti
71a2608310 Use the Buf_Peel function to get to the string contained into a 
buffer without using an extra local variable.
 2005-03-08 14:33:58 +00:00
harti
645fdd0f11 Remove useless local prototypes. 2005-03-08 14:30:18 +00:00
harti
aec2338af9 Style: fix indentation. 2005-03-08 14:29:23 +00:00
harti
3d0845b481 Use the new Buf_Peel function to simplify things. 
Remove an unused struct definition.
 2005-03-08 13:15:51 +00:00
harti
d8085e2228 Create a new function Buf_Peel that returns the string from inside 
a Buffer and frees the Buffer.
 2005-03-08 13:15:18 +00:00
harti
9719ee7af7 Add a debugging function that prints a message and appends the 
current strerror.
 2005-03-08 07:47:14 +00:00
harti
d28f5e232e Mark functions that don't return as dead. 2005-03-08 07:45:50 +00:00
harti
6bf66a2080 Finish constification of Var_Parse() and Var_Subst(). 
Patch:		0.18, 0.8, 7.110

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-08 07:43:57 +00:00
harti
1cdb32f8eb Constify the callers of brk_string in this file. 
Patch:		7.108

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-07 16:23:53 +00:00
harti
559a7bb274 Style: fix indendation of VarModify(). 
Patch:		7.107

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-07 16:14:50 +00:00
harti
44c51b91c7 Constify the input argument to brk_string. 
Patch:		7.106

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-07 16:10:39 +00:00
harti
7a2e27092a Factor out the 'S' modifier into its own function. Move a variable 
that is now used for both the 'M'/'N' branch and the 'S' branch of
the switch statement into a common scope.

Patch:		7.102-105
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-07 16:08:39 +00:00
harti
360a1da14d Move the 'M' and 'N' modifiers into their own function. 
Patch:		7.101

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-07 12:43:59 +00:00
harti
e701d73efd Style: remove unneeded parantheses in conditionals. 2005-03-03 11:34:04 +00:00
harti
ee1efc8131 Constify the code paths for the 'M' and 'N' modifiers. 
Patch:		7.100

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-03 11:26:28 +00:00
harti
bed0867bba Fix parsing of archives: in System V archive format the member names 
is terminated with a slash. Although we are not System V, ar has
been configured to put that slash in. This format allows filenames
with trailing spaces.
 2005-03-03 10:46:23 +00:00
harti
e40b6c3875 Fix parsing of archive specifications on the target side of 
dependency lines.  It seems that nobody is actually is using
the archive-feature of make.
 2005-03-03 10:09:39 +00:00
harti
146cfcffbc Update the description comment of the function to reflect the 
previous change.
 2005-03-03 10:07:28 +00:00
harti
68bf1b2765 Transform VarParseLong() so that the lifetime and the constness of 
variables gets clearer. Transform if() conditions to make the flow
clearer.

Patch:		7.93-99

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-03 07:25:04 +00:00
harti
0724297b39 Move the check for the error case (variable ends without a closing 
paranthesis or brace) into the loop and don't leak the buffer in this
case. Remove the check for Var_Parse returning NULL - it can't.

Patch:		7.92

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-02 15:52:04 +00:00
harti
70c2a8abb1 Fix indentation on a block of code. 
Patch:		7.91

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-02 14:43:40 +00:00
harti
b1816b2629 Push the length computation down into VarParseShort(). 
Return always malloc()-ed strings from VarParseShort() to get
rid of warnings when returning string constants from a non-const char *
function.

Patch:		7.90

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-02 14:30:36 +00:00
harti
cfe299800f Convert a function call to Lst_ForEach with a macro call to LST_FOREACH. 2005-03-02 12:00:21 +00:00
harti
9dee98908c Use the LST_FOREACH macro instead of the Lst_ForEach function. This 
saves function calls and reduces void casting.
 2005-03-02 08:30:49 +00:00
harti
cacd7f8171 Make sure the length variable is initialized to 0 before passing 
it to Var_Parse().

Patch:		7.85

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-01 17:52:18 +00:00
harti
ba225fbbb5 Split out ParseModifiers from VarParseLong. 
Patch:		7.84
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-01 12:26:32 +00:00
harti
24ff2a5626 VarParseLong: Create new else block for haveModifier. Move the call 
to VarExpand down into the branches of the if as well as cleanup code.
Eliminate code that is now obviously dead.

Patch:		7.83

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-01 12:22:07 +00:00
harti
6db6af010a Reverse a condition so that the else clause can be changed 
to a fallthrough.

Patch:		7.82

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-03-01 07:58:18 +00:00
harti
c177bb55fb VarParseLong: Move the initialisation of dynamic up which saves 
an else clause. Move the assignment to the lengthPtr down to
just before the return statements.

Patch:		7.81

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-28 17:23:17 +00:00
harti
6e3e336d4e Buf_GetAll wants a pointer as its second argument, not a boolean - 
replace FALSE by NULL.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-28 17:05:26 +00:00
harti
b62f7499ab Don't modify the input string in VarParseLong(). It is not 
necessary to NUL-terminated it, because we know the lengths
from the pointers.

Patch:		7.80

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-28 15:01:37 +00:00
harti
6829935329 Major clean up and split the Var_Parse monster function into three 
functions: one for the single letter variables, one for the others
and one that does the recursive expansion.

Patches:	7.68-7.79

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-26 08:54:40 +00:00
harti
d1abcd79ac Change the return value of Var_Subst to return a Buffer instead 
of a char *.

Patch:		7.49

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-25 13:16:56 +00:00
harti
1d7e5b95d3 Var_Parse: Separate different error states by introducing an else block 
after a return. Move assignments to {freePtr, dynamic, start} closer to the
return statements to clarify which variables are actually used for
communication between the losely coupled blocks of the code. Clear up
an if-expression to make common structures of the conditions clearer.
Use strchr instead of switch statements to check for a character beeing
a member of a set.

Patches:	7-62.2, 7-62.3, 7-64, 7-65.1, 7-65.2
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-24 16:05:45 +00:00
harti
b7895e139c Push assignments to just before the returns from the function to 
get it clearer what variables are actually needed.

Patches:	7.62.2, 7.62.3
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-24 10:35:39 +00:00
harti
0cc9f8934c Fix wording of a comment. 
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
 2005-02-24 10:30:23 +00:00
harti
7873864c55 Replace the calls to Lst_ForEach with the new LST_FOREACH macro and 
fix the prototype for Compat_RunCommand to take the actual argument
types instead of void *.
 2005-02-24 10:23:31 +00:00
harti
4894ce3722 Use the LST_FOREACH macro instead of the Lst_ForEach function 
and so get rid of the ForExec helper function by inlining it
into For_Run.
 2005-02-23 14:03:18 +00:00