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

BUG: Handle DOS files un unix file systems

Browse Source
This commit is contained in:
Andy Cedilnik 2004-10-26 20:13:39 -04:00
parent c57512ea38
commit c48af00154
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmCacheManager.cxx
View File

@ -83,9 +83,9 @@ bool cmCacheManager::ParseEntry(const char* entry,
std::string& value) std::string& value)
{ {
// input line is: key:type=value // input line is: key:type=value
cmsys::RegularExpression reg("^([^:]*)=(.*[^\t ]|[\t ]*)[\t ]*$"); cmsys::RegularExpression reg("^([^:]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
// input line is: "key":type=value // input line is: "key":type=value
cmsys::RegularExpression regQuoted("^\"([^\"]*)\"=(.*[^\t ]|[\t ]*)[\t ]*$"); cmsys::RegularExpression regQuoted("^\"([^\"]*)\"=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
bool flag = false; bool flag = false;
if(regQuoted.find(entry)) if(regQuoted.find(entry))
{ {
@ -120,9 +120,9 @@ bool cmCacheManager::ParseEntry(const char* entry,
CacheEntryType& type) CacheEntryType& type)
{ {
// input line is: key:type=value // input line is: key:type=value
cmsys::RegularExpression reg("^([^:]*):([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$"); cmsys::RegularExpression reg("^([^:]*):([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
// input line is: "key":type=value // input line is: "key":type=value
cmsys::RegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$"); cmsys::RegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
bool flag = false; bool flag = false;
if(regQuoted.find(entry)) if(regQuoted.find(entry))
{ {
@ -182,6 +182,7 @@ bool cmCacheManager::LoadCache(const char* path,
while(*realbuffer != '0' && while(*realbuffer != '0' &&
(*realbuffer == ' ' || (*realbuffer == ' ' ||
*realbuffer == '\t' || *realbuffer == '\t' ||
*realbuffer == '\r' ||
*realbuffer == '\n')) *realbuffer == '\n'))
{ {
realbuffer++; realbuffer++;