diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-10-27 00:13:39 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-10-27 00:13:39 (GMT) |
| commit | c48af00154f6627b63bb6b003875cd524cde35ec (patch) | |
| tree | 4ab5db16966e32d8f24984c9cbc4214f4260f63b /Source/cmCacheManager.cxx | |
| parent | c57512ea387d669d3139e814477ecbc182ea173e (diff) | |
| download | CMake-c48af00154f6627b63bb6b003875cd524cde35ec.zip CMake-c48af00154f6627b63bb6b003875cd524cde35ec.tar.gz CMake-c48af00154f6627b63bb6b003875cd524cde35ec.tar.bz2 | |
BUG: Handle DOS files un unix file systems
Diffstat (limited to 'Source/cmCacheManager.cxx')
| -rw-r--r-- | Source/cmCacheManager.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 1d82f42..a1692af 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -83,9 +83,9 @@ bool cmCacheManager::ParseEntry(const char* entry, std::string& 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 - cmsys::RegularExpression regQuoted("^\"([^\"]*)\"=(.*[^\t ]|[\t ]*)[\t ]*$"); + cmsys::RegularExpression regQuoted("^\"([^\"]*)\"=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$"); bool flag = false; if(regQuoted.find(entry)) { @@ -120,9 +120,9 @@ bool cmCacheManager::ParseEntry(const char* entry, CacheEntryType& type) { // 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 - cmsys::RegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$"); + cmsys::RegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$"); bool flag = false; if(regQuoted.find(entry)) { @@ -182,6 +182,7 @@ bool cmCacheManager::LoadCache(const char* path, while(*realbuffer != '0' && (*realbuffer == ' ' || *realbuffer == '\t' || + *realbuffer == '\r' || *realbuffer == '\n')) { realbuffer++; |