github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-08-31 03:38:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs 5798 and 6195.

Browse Source
This commit is contained in:
Paul Smith
2003-11-04 07:40:29 +00:00
parent 76f034acaa
commit ee3d37a591
6 changed files with 72 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
function.c
View File

@@ -678,6 +678,11 @@ func_words (char *o, char **argv, const char *funcname)
return o;
}
/* Set begpp to point to the first non-whitespace character of the string,
* and endpp to point to the last non-whitespace character of the string.
* If the string is empty or contains nothing but whitespace, endpp will be
* begpp-1.
*/
static char *
strip_whitespace (const char **begpp, const char **endpp)
{
@@ -1134,7 +1139,7 @@ static char *
func_if (char *o, char **argv, const char *funcname)
{
const char *begp = argv[0];
const char *endp = begp + strlen (argv[0]);
const char *endp = begp + strlen (argv[0]) - 1;
int result = 0;
/* Find the result of the condition: if we have a value, and it's not
@@ -1143,9 +1148,9 @@ func_if (char *o, char **argv, const char *funcname)
strip_whitespace (&begp, &endp);
if (begp < endp)
if (begp <= endp)
{
char *expansion = expand_argument (begp, NULL);
char *expansion = expand_argument (begp, endp+1);
result = strlen (expansion);
free (expansion);