From d69d77e5d11e46ecf3f41d1583417567ef1e6a51 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 1 Aug 2006 18:04:01 +0000 Subject: [PATCH] Use Path::getFileStatus to get status-related info. llvm-svn: 29444 --- tools/gccld/GenerateCode.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/gccld/GenerateCode.cpp b/tools/gccld/GenerateCode.cpp index fc674f7088d..63dda12aa07 100644 --- a/tools/gccld/GenerateCode.cpp +++ b/tools/gccld/GenerateCode.cpp @@ -151,12 +151,9 @@ static bool isBytecodeLPath(const std::string &LibPath) { sys::Path LPath(LibPath); // Make sure it exists and is a directory - try { - if (!LPath.exists() || !LPath.isDirectory()) - return false; - } catch (std::string& xcptn) { + sys::FileStatus Status; + if (LPath.getFileStatus(Status) || !Status.isDir) return false; - } // Grab the contents of the -L path std::set Files; @@ -169,12 +166,13 @@ static bool isBytecodeLPath(const std::string &LibPath) { std::string dllsuffix = sys::Path::GetDLLSuffix(); for (; File != Files.end(); ++File) { - if ( File->isDirectory() ) + // Not a file? + if (File->getFileStatus(Status) || Status.isDir) continue; std::string path = File->toString(); - // Check for an ending '.dll,.so' or '.a' suffix as all + // Check for an ending '.dll', '.so' or '.a' suffix as all // other files are not of interest to us here if (path.find(dllsuffix, path.size()-dllsuffix.size()) == std::string::npos && path.find(".a", path.size()-2) == std::string::npos)