Fix crashing on unhandled system_error thrown by file_exists()

1 files changed, 29 insertions, 1 deletions

diff --git a/build2/filesystem.cxx b/build2/filesystem.cxx
index 44b0ba4..c9696dc 100644
--- a/build2/filesystem.cxx
+++ b/build2/filesystem.cxx
@@ -79,7 +79,7 @@ namespace build2
     if (work.sub (d)) // Don't try to remove working directory.
       return rmdir_status::not_empty;
 
-    if (!dir_exists (d))
+    if (!exists (d))
       return rmdir_status::not_exist;
 
     if (verb >= v)
@@ -96,4 +96,32 @@ namespace build2
 
     return rmdir_status::success;
   }
+
+  bool
+  exists (const path& f, bool fs)
+  {
+    try
+    {
+      return file_exists (f, fs);
+    }
+    catch (const system_error& e)
+    {
+      error << "unable to stat path " << f << ": " << e.what ();
+      throw failed ();
+    }
+  }
+
+  bool
+  exists (const dir_path& d)
+  {
+    try
+    {
+      return dir_exists (d);
+    }
+    catch (const system_error& e)
+    {
+      error << "unable to stat path " << d << ": " << e.what ();
+      throw failed ();
+    }
+  }
 }