Allow inner whitespace in the right-hand side of an environment variable
assignment even if it is not quoted (as advertised by the man page). This fixes a regression wrt RELENG_4 introduced in rev. 1.11. Problem noted and patch tested by: CHOI Junho <cjh@kr.FreeBSD.org> Reviewed by: roberto
This commit is contained in:
parent
4e44912c6c
commit
6ced08bfa6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=110638
@ -193,14 +193,16 @@ load_env(envstr, f)
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (isspace (*c)) {
|
||||
state++;
|
||||
c++;
|
||||
break;
|
||||
}
|
||||
if (state == NAME && *c == '=') {
|
||||
state++;
|
||||
break;
|
||||
if (state == NAME) {
|
||||
if (isspace (*c)) {
|
||||
c++;
|
||||
state++;
|
||||
break;
|
||||
}
|
||||
if (*c == '=') {
|
||||
state++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
*str++ = *c++;
|
||||
@ -232,9 +234,14 @@ load_env(envstr, f)
|
||||
Set_LineNum(fileline);
|
||||
return (FALSE);
|
||||
}
|
||||
if (state == VALUE) {
|
||||
/* End of unquoted value: trim trailing whitespace */
|
||||
c = val + strlen (val);
|
||||
while (c > val && isspace (*(c - 1)))
|
||||
*(--c) = '\0';
|
||||
}
|
||||
|
||||
/* 2 fields from parser; looks like an env setting
|
||||
*/
|
||||
/* 2 fields from parser; looks like an env setting */
|
||||
|
||||
if (strlen(name) + 1 + strlen(val) >= MAX_ENVSTR-1)
|
||||
return (FALSE);
|
||||
|
Loading…
Reference in New Issue
Block a user