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

Merge topic 'update-kwsys' 

7df291f Merge branch 'upstream-kwsys' into update-kwsys
9d66f74 KWSys 2013-02-05 (5c34ed2e)
This commit is contained in:
Brad King 2013-02-08 13:38:23 -05:00 committed by CMake Topic Stage
parent 98cca40d9b 7df291fb6e
commit e8df4cab82
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/kwsys/SystemTools.cxx
View File

@ -196,18 +196,16 @@ inline int Rmdir(const char* dir)
}
inline const char* Getcwd(char* buf, unsigned int len)
{
const char* ret = _getcwd(buf, len);
if(!ret)
if(const char* ret = _getcwd(buf, len))
{
fprintf(stderr, "No current working directory.\n");
abort();
// make sure the drive letter is capital
if(strlen(buf) > 1 && buf[1] == ':')
{
buf[0] = toupper(buf[0]);
}
return ret;
}
// make sure the drive letter is capital
if(strlen(buf) > 1 && buf[1] == ':')
{
buf[0] = toupper(buf[0]);
}
return ret;
return 0;
}
inline int Chdir(const char* dir)
{
@ -245,13 +243,7 @@ inline int Rmdir(const char* dir)
}
inline const char* Getcwd(char* buf, unsigned int len)
{
const char* ret = getcwd(buf, len);
if(!ret)
{
fprintf(stderr, "No current working directory\n");
abort();
}
return ret;
return getcwd(buf, len);
}
inline int Chdir(const char* dir)
@ -3089,7 +3081,7 @@ kwsys_stl::string SystemTools::CollapseFullPath(const char* in_path,
}
else
{
// ??
base_components.push_back("");
}
}