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

fixed bug in get short path for quoted paths

Browse Source
This commit is contained in:
Ken Martin 2002-05-31 08:39:49 -04:00
parent c24c2cca18
commit 993aebb748
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmSystemTools.cxx
View File

@ -1960,8 +1960,23 @@ bool cmSystemTools::GetShortPath(const char* path, std::string& shortPath)
#if defined(WIN32) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__CYGWIN__)
const int size = int(strlen(path)) +1; // size of return const int size = int(strlen(path)) +1; // size of return
char *buffer = new char[size]; // create a buffer char *buffer = new char[size]; // create a buffer
char *tempPath = new char[size]; // create a buffer
int ret;
// if the path passed in has quotes around it, first remove the quotes
if (path[0] == '"' && path[strlen(path)-1] == '"')
{
strcpy(tempPath,path+1);
tempPath[strlen(tempPath)-1] = '\0';
}
else
{
strcpy(tempPath,path);
}
buffer[0] = 0; buffer[0] = 0;
int ret = GetShortPathName(path, buffer, size); ret = GetShortPathName(tempPath, buffer, size);
if(buffer[0] == 0 || ret > size) if(buffer[0] == 0 || ret > size)
{ {
if(ret < size) if(ret < size)
@ -1982,12 +1997,14 @@ bool cmSystemTools::GetShortPath(const char* path, std::string& shortPath)
LocalFree( lpMsgBuf ); LocalFree( lpMsgBuf );
} }
cmSystemTools::Error("Unable to get a short path: ", path); cmSystemTools::Error("Unable to get a short path: ", path);
delete [] tempPath;
return false; return false;
} }
else else
{ {
shortPath = buffer; shortPath = buffer;
delete [] buffer; delete [] buffer;
delete [] tempPath;
return true; return true;
} }
#else #else