Implement functionality suggested from code review: getStatusInfo should

returnn false if the file doesn't exist rather than throw ane exception.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17809 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/System/Unix/Path.cpp b/lib/System/Unix/Path.cpp
index c6dbf87ed0b90ded1438697a9823748459bcfd1a..d2ba0f903591080acd594eb53998a2a5c2e3573f 100644 (file)
--- a/lib/System/Unix/Path.cpp
+++ b/lib/System/Unix/Path.cpp
@@ -239,8 +239,10 @@ Path::getLast() const {
   return path.substr(pos+1);
 }
 
-void
+bool
 Path::getStatusInfo(StatusInfo& info) {
+  if (!isFile() || !readable())
+    return false;
   struct stat buf;
   if (0 != stat(path.c_str(), &buf)) {
     ThrowErrno(std::string("Can't get status: ")+path);
@@ -253,6 +255,7 @@ Path::getStatusInfo(StatusInfo& info) {
   info.isDir = S_ISDIR(buf.st_mode);
   if (info.isDir && path[path.length()-1] != '/')
     path += '/';
+  return true;
 }
 
 bool

diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index c6dbf87ed0b90ded1438697a9823748459bcfd1a..d2ba0f903591080acd594eb53998a2a5c2e3573f 100644 (file)
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -239,8 +239,10 @@ Path::getLast() const {
   return path.substr(pos+1);
 }
 
-void
+bool
 Path::getStatusInfo(StatusInfo& info) {
+  if (!isFile() || !readable())
+    return false;
   struct stat buf;
   if (0 != stat(path.c_str(), &buf)) {
     ThrowErrno(std::string("Can't get status: ")+path);
@@ -253,6 +255,7 @@ Path::getStatusInfo(StatusInfo& info) {
   info.isDir = S_ISDIR(buf.st_mode);
   if (info.isDir && path[path.length()-1] != '/')
     path += '/';
+  return true;
 }
 
 bool