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

For PR789:

Browse Source 
Make the sys::Path::getFileStatus function more efficient by having it
return a pointer to the FileStatus structure rather than copy it. Adjust
uses of the function accordingly. Also, fix some memory issues in sys::Path.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35476 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer
2007-03-29 19:05:44 +00:00
parent f735f7b3ac
commit 8475ec068c
16 changed files with 123 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/llvm-ar/llvm-ar.cpp
View File

@ -281,16 +281,16 @@ recurseDirectories(const sys::Path& path,
for (std::set<sys::Path>::iterator I = content.begin(), E = content.end();
I != E; ++I) {
// Make sure it exists and is a directory
sys::FileStatus Status;
if (I->getFileStatus(Status)) {
if (Status.isDir) {
std::set<sys::Path> moreResults;
if (recurseDirectories(*I, moreResults, ErrMsg))
return true;
result.insert(moreResults.begin(), moreResults.end());
} else {
const sys::FileStatus *Status = I->getFileStatus(false, ErrMsg);
if (!Status)
return true;
if (Status->isDir) {
std::set<sys::Path> moreResults;
if (recurseDirectories(*I, moreResults, ErrMsg))
return true;
result.insert(moreResults.begin(), moreResults.end());
} else {
result.insert(*I);
}
}
}
}
@ -308,11 +308,11 @@ bool buildPaths(bool checkExistence, std::string* ErrMsg) {
if (checkExistence) {
if (!aPath.exists())
throw std::string("File does not exist: ") + Members[i];
sys::FileStatus si;
std::string Err;
if (aPath.getFileStatus(si, false, &Err))
const sys::FileStatus *si = aPath.getFileStatus(false, &Err);
if (!si)
throw Err;
if (si.isDir) {
if (si->isDir) {
std::set<sys::Path> dirpaths;
if (recurseDirectories(aPath, dirpaths, ErrMsg))
return true;
@ -644,14 +644,14 @@ doReplaceOrInsert(std::string* ErrMsg) {
}
if (found != remaining.end()) {
sys::FileStatus si;
std::string Err;
if (found->getFileStatus(si, false, &Err))
const sys::FileStatus *si = found->getFileStatus(false, &Err);
if (!si)
return true;
if (si.isDir) {
if (si->isDir) {
if (OnlyUpdate) {
// Replace the item only if it is newer.
if (si.modTime > I->getModTime())
if (si->modTime > I->getModTime())
if (I->replaceWith(*found, ErrMsg))
return true;
} else {