d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort out the error case that a single '$' was passed a little bit

Browse Source 
earlier instead of mixing its handling with other cases.

Submitted by:	Max Okumoto <okumoto@ucsd.edu>
This commit is contained in:
Hartmut Brandt 2005-02-17 09:01:19 +00:00
parent a94f16f4fa
commit 768820f8c7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=142007
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.bin/make/var.c
View File

@ -1065,6 +1065,14 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
}
}
Buf_Destroy(buf, TRUE);
} else if (str[1] == '\0') {
/*
* Error - there is only a dollar sign!
*/
*lengthPtr = 1;
return (err ? var_Error : varNoError);
} else {
/*
* If it's not bounded by braces of some sort, life is much simpler.
@ -1073,16 +1081,13 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
*/
char name[2];
*lengthPtr = 2;
name[0] = str[1];
name[1] = '\0';
v = VarFind(name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
if (v == (Var *)NULL) {
if (str[1] != '\0')
*lengthPtr = 2;
else
*lengthPtr = 1;
if (v == NULL) {
if ((ctxt == VAR_CMD) || (ctxt == VAR_GLOBAL)) {
/*
* If substituting a local variable in a non-local context,