From: Reid Spencer Date: Wed, 23 Aug 2006 06:56:27 +0000 (+0000) Subject: For PR797: X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=142ca8e81800ce6bcb511f3250bae23210d38ec8;p=oota-llvm.git For PR797: Remove exception throwing from Path::getDirectoryContents and its users. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29841 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h index e354efead51..5609f61cb09 100644 --- a/include/llvm/System/Path.h +++ b/include/llvm/System/Path.h @@ -343,10 +343,12 @@ namespace sys { /// This function builds a list of paths that are the names of the /// files and directories in a directory. - /// @returns false if \p this is not a directory, true otherwise - /// @throws std::string if the directory cannot be searched + /// @returns true if an error occurs, true otherwise /// @brief Build a list of directory's contents. - bool getDirectoryContents(std::set &paths) const; + bool getDirectoryContents( + std::set &paths, ///< The resulting list of file & directory names + std::string* ErrMsg ///< Optional place to return an error message. + ) const; /// This function returns status information about the file. The type of /// path (file or directory) is updated to reflect the actual contents diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc index 7fc77a99766..2b9f1263ee3 100644 --- a/lib/System/Unix/Path.inc +++ b/lib/System/Unix/Path.inc @@ -415,10 +415,12 @@ bool Path::makeExecutableOnDisk(std::string* ErrMsg) { } bool -Path::getDirectoryContents(std::set& result) const { +Path::getDirectoryContents(std::set& result, std::string* ErrMsg) const { DIR* direntries = ::opendir(path.c_str()); - if (direntries == 0) - ThrowErrno(path + ": can't open directory"); + if (direntries == 0) { + MakeErrMsg(ErrMsg, path + ": can't open directory"); + return true; + } std::string dirPath = path; if (!lastIsSlash(dirPath)) @@ -433,14 +435,15 @@ Path::getDirectoryContents(std::set& result) const { if (0 != lstat(aPath.path.c_str(), &st)) { if (S_ISLNK(st.st_mode)) continue; // dangling symlink -- ignore - ThrowErrno(aPath.path + ": can't determine file object type"); + MakeErrMsg(ErrMsg, aPath.path + ": can't determine file object type"); + return true; } result.insert(aPath); } } closedir(direntries); - return true; + return false; } bool diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc index 2f2e8520133..913a4091aca 100644 --- a/lib/System/Win32/Path.inc +++ b/lib/System/Win32/Path.inc @@ -353,9 +353,11 @@ bool Path::makeExecutableOnDisk(std::string* ErrMsg) { } bool -Path::getDirectoryContents(std::set& result) const { - if (!isDirectory()) - return false; +Path::getDirectoryContents(std::set& result, std::string* ErrMsg) const { + if (!isDirectory()) { + MakeErrMsg(ErrMsg, path + ": not a directory"); + return true; + } result.clear(); WIN32_FIND_DATA fd; @@ -369,7 +371,8 @@ Path::getDirectoryContents(std::set& result) const { if (h == INVALID_HANDLE_VALUE) { if (GetLastError() == ERROR_FILE_NOT_FOUND) return true; // not really an error, now is it? - ThrowError(path + ": Can't read directory: "); + MakeErrMsg(ErrMsg, path + ": Can't read directory: "); + return true; } do { @@ -384,9 +387,10 @@ Path::getDirectoryContents(std::set& result) const { FindClose(h); if (err != ERROR_NO_MORE_FILES) { SetLastError(err); - ThrowError(path + ": Can't read directory: "); + MakeErrMsg(ErrMsg, path + ": Can't read directory: "); + return true; } - return true; + return false; } bool diff --git a/tools/gccld/GenerateCode.cpp b/tools/gccld/GenerateCode.cpp index 285f7ca84cd..61bcdfae717 100644 --- a/tools/gccld/GenerateCode.cpp +++ b/tools/gccld/GenerateCode.cpp @@ -157,7 +157,8 @@ static bool isBytecodeLPath(const std::string &LibPath) { // Grab the contents of the -L path std::set Files; - LPath.getDirectoryContents(Files); + if (LPath.getDirectoryContents(Files, 0)) + return false; // Iterate over the contents one by one to determine // if this -L path has any bytecode shared libraries diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index e5abea4f904..f266e1f3a57 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -269,32 +269,38 @@ ArchiveOperation parseCommandLine() { // the Paths vector (built by buildPaths, below) and replaces any directories it // finds with all the files in that directory (recursively). It uses the // sys::Path::getDirectoryContent method to perform the actual directory scans. -std::set recurseDirectories(const sys::Path& path) { - std::set result; +bool +recurseDirectories(const sys::Path& path, + std::set& result, std::string* ErrMsg) { + result.clear(); if (RecurseDirectories) { std::set content; - path.getDirectoryContents(content); + if (path.getDirectoryContents(content, ErrMsg)) + return true; + for (std::set::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 moreResults = recurseDirectories(*I); - result.insert(moreResults.begin(), moreResults.end()); - } else { - result.insert(*I); - } - } + // Make sure it exists and is a directory + sys::FileStatus Status; + if (I->getFileStatus(Status)) { + if (Status.isDir) { + std::set moreResults; + if (recurseDirectories(*I, moreResults, ErrMsg)) + return true; + result.insert(moreResults.begin(), moreResults.end()); + } else { + result.insert(*I); + } + } } } - return result; + return false; } // buildPaths - Convert the strings in the Members vector to sys::Path objects // and make sure they are valid and exist exist. This check is only needed for // the operations that add/replace files to the archive ('q' and 'r') -void buildPaths(bool checkExistence = true) { +bool buildPaths(bool checkExistence, std::string* ErrMsg) { for (unsigned i = 0; i < Members.size(); i++) { sys::Path aPath; if (!aPath.set(Members[i])) @@ -307,7 +313,9 @@ void buildPaths(bool checkExistence = true) { if (aPath.getFileStatus(si, &Err)) throw Err; if (si.isDir) { - std::set dirpaths = recurseDirectories(aPath); + std::set dirpaths; + if (recurseDirectories(aPath, dirpaths, ErrMsg)) + return true; Paths.insert(dirpaths.begin(),dirpaths.end()); } else { Paths.insert(aPath); @@ -316,6 +324,7 @@ void buildPaths(bool checkExistence = true) { Paths.insert(aPath); } } + return false; } // printSymbolTable - print out the archive's symbol table. @@ -333,8 +342,9 @@ void printSymbolTable() { // looking for members that match the path list. It is careful to uncompress // things that should be and to skip bytecode files unless the 'k' modifier was // given. -void doPrint() { - buildPaths(false); +bool doPrint(std::string* ErrMsg) { + if (buildPaths(false, ErrMsg)) + return true; unsigned countDown = Count; for (Archive::iterator I = TheArchive->begin(), E = TheArchive->end(); I != E; ++I ) { @@ -365,11 +375,13 @@ void doPrint() { } } } + return false; } // putMode - utility function for printing out the file mode when the 't' // operation is in verbose mode. -void printMode(unsigned mode) { +void +printMode(unsigned mode) { if (mode & 004) std::cout << "r"; else @@ -388,8 +400,10 @@ void printMode(unsigned mode) { // the file names of each of the members. However, if verbose mode is requested // ('v' modifier) then the file type, permission mode, user, group, size, and // modification time are also printed. -void doDisplayTable() { - buildPaths(false); +bool +doDisplayTable(std::string* ErrMsg) { + if (buildPaths(false, ErrMsg)) + return true; for (Archive::iterator I = TheArchive->begin(), E = TheArchive->end(); I != E; ++I ) { if (Paths.empty() || @@ -422,12 +436,15 @@ void doDisplayTable() { } if (ReallyVerbose) printSymbolTable(); + return false; } // doExtract - Implement the 'x' operation. This function extracts files back to // the file system, making sure to uncompress any that were compressed -bool doExtract(std::string* ErrMsg) { - buildPaths(false); +bool +doExtract(std::string* ErrMsg) { + if (buildPaths(false, ErrMsg)) + return true; unsigned countDown = Count; for (Archive::iterator I = TheArchive->begin(), E = TheArchive->end(); I != E; ++I ) { @@ -472,9 +489,12 @@ bool doExtract(std::string* ErrMsg) { // members from the archive. Note that if the count is specified, there should // be no more than one path in the Paths list or else this algorithm breaks. // That check is enforced in parseCommandLine (above). -void doDelete() { - buildPaths(false); - if (Paths.empty()) return; +bool +doDelete(std::string* ErrMsg) { + if (buildPaths(false, ErrMsg)) + return true; + if (Paths.empty()) + return false; unsigned countDown = Count; for (Archive::iterator I = TheArchive->begin(), E = TheArchive->end(); I != E; ) { @@ -491,20 +511,21 @@ void doDelete() { } // We're done editting, reconstruct the archive. - std::string errmsg; - if (!TheArchive->writeToDisk(SymTable,TruncateNames,Compression,&errmsg)) - throw errmsg; + if (!TheArchive->writeToDisk(SymTable,TruncateNames,Compression,ErrMsg)) + return true; if (ReallyVerbose) printSymbolTable(); + return false; } // doMore - Implement the move operation. This function re-arranges just the // order of the archive members so that when the archive is written the move // of the members is accomplished. Note the use of the RelPos variable to // determine where the items should be moved to. -void doMove() { - - buildPaths(false); +bool +doMove(std::string* ErrMsg) { + if (buildPaths(false, ErrMsg)) + return true; // By default and convention the place to move members to is the end of the // archive. @@ -545,19 +566,22 @@ void doMove() { } // We're done editting, reconstruct the archive. - std::string errmsg; - if (!TheArchive->writeToDisk(SymTable,TruncateNames,Compression,&errmsg)) - throw errmsg; + if (!TheArchive->writeToDisk(SymTable,TruncateNames,Compression,ErrMsg)) + return true; if (ReallyVerbose) printSymbolTable(); + return false; } // doQuickAppend - Implements the 'q' operation. This function just // indiscriminantly adds the members to the archive and rebuilds it. -void doQuickAppend() { +bool +doQuickAppend(std::string* ErrMsg) { // Get the list of paths to append. - buildPaths(true); - if (Paths.empty()) return; + if (buildPaths(true, ErrMsg)) + return true; + if (Paths.empty()) + return false; // Append them quickly. for (std::set::iterator PI = Paths.begin(), PE = Paths.end(); @@ -566,20 +590,23 @@ void doQuickAppend() { } // We're done editting, reconstruct the archive. - std::string errmsg; - if (!TheArchive->writeToDisk(SymTable,TruncateNames,Compression,&errmsg)) - throw errmsg; + if (!TheArchive->writeToDisk(SymTable,TruncateNames,Compression,ErrMsg)) + return true; if (ReallyVerbose) printSymbolTable(); + return false; } // doReplaceOrInsert - Implements the 'r' operation. This function will replace // any existing files or insert new ones into the archive. -void doReplaceOrInsert() { +bool +doReplaceOrInsert(std::string* ErrMsg) { // Build the list of files to be added/replaced. - buildPaths(true); - if (Paths.empty()) return; + if (buildPaths(true, ErrMsg)) + return true; + if (Paths.empty()) + return false; // Keep track of the paths that remain to be inserted. std::set remaining(Paths); @@ -657,11 +684,11 @@ void doReplaceOrInsert() { } // We're done editting, reconstruct the archive. - std::string errmsg; - if (!TheArchive->writeToDisk(SymTable,TruncateNames,Compression,&errmsg)) - throw errmsg; + if (!TheArchive->writeToDisk(SymTable,TruncateNames,Compression,ErrMsg)) + return true; if (ReallyVerbose) printSymbolTable(); + return false; } // main - main program for llvm-ar .. see comments in the code @@ -714,23 +741,23 @@ int main(int argc, char **argv) { // Perform the operation std::string ErrMsg; + bool haveError = false; switch (Operation) { - case Print: doPrint(); break; - case Delete: doDelete(); break; - case Move: doMove(); break; - case QuickAppend: /* FALL THROUGH */ - case ReplaceOrInsert: doReplaceOrInsert(); break; - case DisplayTable: doDisplayTable(); break; - case Extract: - if (doExtract(&ErrMsg)) { - std::cerr << argv[0] << ": " << ErrMsg << "\n"; - return 1; - } - break; + case Print: haveError = doPrint(&ErrMsg); break; + case Delete: haveError = doDelete(&ErrMsg); break; + case Move: haveError = doMove(&ErrMsg); break; + case QuickAppend: haveError = doQuickAppend(&ErrMsg); break; + case ReplaceOrInsert: haveError = doReplaceOrInsert(&ErrMsg); break; + case DisplayTable: haveError = doDisplayTable(&ErrMsg); break; + case Extract: haveError = doExtract(&ErrMsg); break; case NoOperation: std::cerr << argv[0] << ": No operation was selected.\n"; break; } + if (haveError) { + std::cerr << argv[0] << ": " << ErrMsg << "\n"; + return 1; + } } catch (const char*msg) { // These errors are usage errors, thrown only by the various checks in the // code above.