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

ENH: handle // in the path

This commit is contained in:
Bill Hoffman 2002-12-23 09:25:36 -05:00
parent e74377dcd8
commit 7c9c1c599d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmSystemTools.cxx
View File

@ -702,6 +702,12 @@ void cmSystemTools::ConvertToUnixSlashes(std::string& path)
path[pos] = '/'; path[pos] = '/';
pos++; pos++;
} }
// Remove all // from the path just like most unix shells
while((pos = path.find("//", 0)) != std::string::npos)
{
cmSystemTools::ReplaceString(path, "//", "/");
}
// remove any trailing slash // remove any trailing slash
if(path.size() && path[path.size()-1] == '/') if(path.size() && path[path.size()-1] == '/')
{ {
@ -1700,7 +1706,6 @@ void cmSystemTools::SplitProgramPath(const char* in_name,
dir = ""; dir = "";
} }
} }
if((dir != "") && !cmSystemTools::FileIsDirectory(dir.c_str())) if((dir != "") && !cmSystemTools::FileIsDirectory(dir.c_str()))
{ {
std::string oldDir = in_name; std::string oldDir = in_name;