6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-06 05:33:28 +00:00
Code Issues Projects Releases Wiki Activity

Avoid manipulating paths in fixed-sized arrays.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118105 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2010-11-02 22:55:34 +00:00
parent 9b0d4bfca0
commit b48a8fddbf
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/System/Unix/Path.inc
View File

@ -143,8 +143,7 @@ Path::GetTemporaryDirectory(std::string *ErrMsg) {
// Linux and FreeBSD have it. Others probably won't.
char pathname[] = "/tmp/llvm_XXXXXX";
if (0 == mkdtemp(pathname)) {
MakeErrMsg(ErrMsg,
std::string(pathname) + ": can't create temporary directory");
MakeErrMsg(ErrMsg, pathname + ": can't create temporary directory");
return Path();
}
Path result;
@ -681,8 +680,7 @@ static bool createDirectoryHelper(char* beg, char* end, bool create_parents) {
bool
Path::createDirectoryOnDisk( bool create_parents, std::string* ErrMsg ) {
// Get a writeable copy of the path name
char pathname[MAXPATHLEN];
path.copy(pathname,MAXPATHLEN);
std::string pathname(path);
// Null-terminate the last component
size_t lastchar = path.length() - 1 ;
@ -692,7 +690,7 @@ Path::createDirectoryOnDisk( bool create_parents, std::string* ErrMsg ) {
pathname[lastchar] = '\0';
if (createDirectoryHelper(pathname, pathname+lastchar, create_parents))
if (createDirectoryHelper(&pathname[0], &pathname[lastchar], create_parents))
return MakeErrMsg(ErrMsg,
std::string(pathname) + ": can't create directory");
@ -759,17 +757,15 @@ Path::eraseFromDisk(bool remove_contents, std::string *ErrStr) const {
}
// Otherwise, try to just remove the one directory.
char pathname[MAXPATHLEN];
path.copy(pathname, MAXPATHLEN);
std::string pathname(path);
size_t lastchar = path.length() - 1;
if (pathname[lastchar] == '/')
pathname[lastchar] = '\0';
else
pathname[lastchar+1] = '\0';
if (rmdir(pathname) != 0)
return MakeErrMsg(ErrStr,
std::string(pathname) + ": can't erase directory");
if (rmdir(pathname.c_str()) != 0)
return MakeErrMsg(ErrStr, pathname + ": can't erase directory");
return false;
}