6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Implement file replacement correctly even with the f (TruncateNames) flag

Browse Source 
set. The member name comparison was failing for truncated names. This patch
fixes that. Truncated names are now properly replaced.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18423 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer
2004-12-02 09:21:55 +00:00
parent 86ac2dcda1
commit 0de66b5cc8
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -578,8 +578,29 @@ void doReplaceOrInsert() {
// Determine if this archive member matches one of the paths we're trying // Determine if this archive member matches one of the paths we're trying
// to replace. // to replace.
std::set<sys::Path>::iterator found =
std::find(remaining.begin(),remaining.end(), I->getPath()); std::set<sys::Path>::iterator found = remaining.end();
for (std::set<sys::Path>::iterator RI = remaining.begin(),
RE = remaining.end(); RI != RE; ++RI ) {
std::string compare(RI->get());
if (TruncateNames && compare.length() > 15) {
const char* nm = compare.c_str();
unsigned len = compare.length();
size_t slashpos = compare.rfind('/');
if (slashpos != std::string::npos) {
nm += slashpos + 1;
len -= slashpos +1;
}
if (len > 15)
len = 15;
compare.assign(nm,len);
}
if (compare == I->getPath().get()) {
found = RI;
break;
}
}
if (found != remaining.end()) { if (found != remaining.end()) {
sys::Path::StatusInfo si; sys::Path::StatusInfo si;
found->getStatusInfo(si); found->getStatusInfo(si);