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

For PR797:

Browse Source 
Remove exceptions from the Path::create*OnDisk methods. Update their users
to handle error messages via arguments and result codes.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29840 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer
2006-08-23 00:39:35 +00:00
parent b590a75eb5
commit e5c9cb5eb6
7 changed files with 71 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,8 +425,8 @@ void doDisplayTable() {
}
// doExtract - Implement the 'x' operation. This function extracts files back to
// the file system, making sure to uncompress any that were compressed.
void doExtract() {
// the file system, making sure to uncompress any that were compressed
bool doExtract(std::string* ErrMsg) {
buildPaths(false);
unsigned countDown = Count;
for (Archive::iterator I = TheArchive->begin(), E = TheArchive->end();
@ -438,7 +438,8 @@ void doExtract() {
if (I->hasPath()) {
sys::Path dirs(I->getPath());
dirs.eraseComponent();
dirs.createDirectoryOnDisk(/*create_parents=*/true);
if (dirs.createDirectoryOnDisk(/*create_parents=*/true, ErrMsg))
return true;
}
// Open up a file stream for writing
@ -464,6 +465,7 @@ void doExtract() {
I->getPath().setStatusInfoOnDisk(I->getFileStatus());
}
}
return false;
}
// doDelete - Implement the delete operation. This function deletes zero or more
@ -711,6 +713,7 @@ int main(int argc, char **argv) {
std::auto_ptr<Archive> AutoArchive(TheArchive);
// Perform the operation
std::string ErrMsg;
switch (Operation) {
case Print: doPrint(); break;
case Delete: doDelete(); break;
@ -718,7 +721,12 @@ int main(int argc, char **argv) {
case QuickAppend: /* FALL THROUGH */
case ReplaceOrInsert: doReplaceOrInsert(); break;
case DisplayTable: doDisplayTable(); break;
case Extract: doExtract(); break;
case Extract:
if (doExtract(&ErrMsg)) {
std::cerr << argv[0] << ": " << ErrMsg << "\n";
return 1;
}
break;
case NoOperation:
std::cerr << argv[0] << ": No operation was selected.\n";
break;