From 142ca8e81800ce6bcb511f3250bae23210d38ec8 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Wed, 23 Aug 2006 06:56:27 +0000
Subject: 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
---
 lib/System/Unix/Path.inc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib/System/Unix')

diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index 7fc77a9..2b9f126 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<Path>& result) const {
+Path::getDirectoryContents(std::set<Path>& 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<Path>& 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
-- 
cgit v1.1