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

BUG: For consistency, use cmStdString. Also, there was a bug in SplitString which make it lose the first character.

This commit is contained in:
Andy Cedilnik 2003-12-26 15:00:27 -05:00
parent b5035770bc
commit 32accc1607
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmSystemTools.cxx
View File

@ -1066,19 +1066,19 @@ bool cmSystemTools::CreateSymlink(const char* origName, const char* newName)
#endif #endif
std::vector<std::string> cmSystemTools::SplitString(const char* p, char sep) std::vector<cmStdString> cmSystemTools::SplitString(const char* p, char sep)
{ {
std::string path = p; std::string path = p;
std::vector<std::string> paths; std::vector<cmStdString> paths;
std::string::size_type pos1 = 0; std::string::size_type pos1 = 0;
std::string::size_type pos2 = path.find(sep, pos1+1); std::string::size_type pos2 = path.find(sep, pos1+1);
while(pos2 != std::string::npos) while(pos2 != std::string::npos)
{ {
paths.push_back(path.substr(pos1+1, pos2-pos1-1)); paths.push_back(path.substr(pos1, pos2-pos1));
pos1 = pos2; pos1 = pos2+1;
pos2 = path.find(sep, pos1+1); pos2 = path.find(sep, pos1+1);
} }
paths.push_back(path.substr(pos1+1, pos2-pos1-1)); paths.push_back(path.substr(pos1, pos2-pos1));
return paths; return paths;
} }
@ -1104,8 +1104,8 @@ std::string cmSystemTools::RelativePath(const char* local, const char* remote)
} }
std::string relativePath; // result string std::string relativePath; // result string
// split up both paths into arrays of strings using / as a separator // split up both paths into arrays of strings using / as a separator
std::vector<std::string> fileSplit = cmSystemTools::SplitString(local); std::vector<cmStdString> fileSplit = cmSystemTools::SplitString(local);
std::vector<std::string> relativeSplit = cmSystemTools::SplitString(remote); std::vector<cmStdString> relativeSplit = cmSystemTools::SplitString(remote);
// count up how many mathing directory names there are from the start // count up how many mathing directory names there are from the start
unsigned int sameCount = 0; unsigned int sameCount = 0;
while(sameCount < fileSplit.size()-1 && sameCount < relativeSplit.size()-1 && while(sameCount < fileSplit.size()-1 && sameCount < relativeSplit.size()-1 &&

2
Source/cmSystemTools.h
View File

@ -249,7 +249,7 @@ public:
///! compute the relative path from local to remote ///! compute the relative path from local to remote
static std::string RelativePath(const char* local, const char* remote); static std::string RelativePath(const char* local, const char* remote);
///! split a path by separator into an array of strings, default is / ///! split a path by separator into an array of strings, default is /
static std::vector<std::string> SplitString(const char* s, char separator = '/'); static std::vector<cmStdString> SplitString(const char* s, char separator = '/');
private: private:
static bool s_ForceUnixPaths; static bool s_ForceUnixPaths;
static bool s_RunCommandHideConsole; static bool s_RunCommandHideConsole;