From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 24 Oct 2016 16:45:55 +0000 (+0100)
Subject: Fix error handling in filesystem::is_empty
X-Git-Tag: upstream/12.2.0~43816
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94caf86019219030154f76b786f9de08c2b81275;p=platform%2Fupstream%2Fgcc.git

Fix error handling in filesystem::is_empty

	* src/filesystem/ops.cc (is_empty): Fix error handling.
	* testsuite/experimental/filesystem/operations/is_empty.cc: New test.

From-SVN: r241488
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bc9a215..e551d39 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2016-10-24  Jonathan Wakely  <jwakely@redhat.com>
 
+	* src/filesystem/ops.cc (is_empty): Fix error handling.
+	* testsuite/experimental/filesystem/operations/is_empty.cc: New test.
+
 	PR libstdc++/71337
 	* src/filesystem/ops.cc (temp_directory_path): Pass error_code
 	argument to other filesystem operations.
diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc
index 90c225b..d9a12df 100644
--- a/libstdc++-v3/src/filesystem/ops.cc
+++ b/libstdc++-v3/src/filesystem/ops.cc
@@ -1022,20 +1022,24 @@ fs::hard_link_count(const path& p, error_code& ec) noexcept
 bool
 fs::is_empty(const path& p)
 {
-  return fs::is_directory(status(p))
-    ? fs::directory_iterator(p) == fs::directory_iterator()
-    : fs::file_size(p) == 0;
+  error_code ec;
+  bool e = is_empty(p, ec);
+  if (ec)
+    _GLIBCXX_THROW_OR_ABORT(filesystem_error("cannot check is file is empty",
+					     p, ec));
+  return e;
 }
 
 bool
 fs::is_empty(const path& p, error_code& ec) noexcept
 {
   auto s = status(p, ec);
-  if (ec.value())
+  if (ec)
     return false;
-  return fs::is_directory(s)
+  bool empty = fs::is_directory(s)
     ? fs::directory_iterator(p, ec) == fs::directory_iterator()
     : fs::file_size(p, ec) == 0;
+  return ec ? false : empty;
 }
 
 fs::file_time_type