kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix for replacement of @var @ only legal variable names should be replaced

This commit is contained in:
Bill Hoffman 2006-06-06 09:39:21 -04:00
parent ef56c8056f
commit 85c5a7dbc0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmMakefile.cxx
View File

@ -1712,8 +1712,16 @@ const char *cmMakefile::ExpandVariablesInString(std::string& source,
{ {
markerPos += markerStartSize; // move past marker markerPos += markerStartSize; // move past marker
// find the end variable marker starting at the markerPos // find the end variable marker starting at the markerPos
// make sure it is a valid variable between
std::string::size_type endVariablePos = std::string::size_type endVariablePos =
source.find(endVariableMarker, markerPos); source.find_first_not_of(
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_",
markerPos);
if(endVariablePos != std::string::npos &&
source[endVariablePos] != endVariableMarker)
{
endVariablePos = std::string::npos;
}
if(endVariablePos == std::string::npos) if(endVariablePos == std::string::npos)
{ {
// no end marker found so add the bogus start // no end marker found so add the bogus start