[gcc r12-10089] libstdc++: Fix error handling in filesystem::equivalent [PR113250]
Ken Matsui
kmatsui@gcc.gnu.org
Thu Jan 11 11:43:55 GMT 2024
https://gcc.gnu.org/g:da19967df3ad5d123888ef24b4fd84be047df226
commit r12-10089-gda19967df3ad5d123888ef24b4fd84be047df226
Author: Ken Matsui <kmatsui@gcc.gnu.org>
Date: Wed Jan 10 22:08:07 2024 -0800
libstdc++: Fix error handling in filesystem::equivalent [PR113250]
This patch made std::filesystem::equivalent correctly throw an exception
when either path does not exist as per [fs.op.equivalent]/4.
PR libstdc++/113250
libstdc++-v3/ChangeLog:
* src/c++17/fs_ops.cc (fs::equivalent): Use || instead of &&.
* src/filesystem/ops.cc (fs::equivalent): Likewise.
* testsuite/27_io/filesystem/operations/equivalent.cc: Handle
error codes.
* testsuite/experimental/filesystem/operations/equivalent.cc:
Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
Reviewed-by: Jonathan Wakely <jwakely@redhat.com>
(cherry picked from commit df147e2ee7199d33d66959c6509ce9c21072077f)
Diff:
---
libstdc++-v3/src/c++17/fs_ops.cc | 2 +-
libstdc++-v3/src/filesystem/ops.cc | 2 +-
libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc | 4 ++--
.../testsuite/experimental/filesystem/operations/equivalent.cc | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc
index 8e612334613..91caff8cd47 100644
--- a/libstdc++-v3/src/c++17/fs_ops.cc
+++ b/libstdc++-v3/src/c++17/fs_ops.cc
@@ -897,7 +897,7 @@ fs::equivalent(const path& p1, const path& p2, error_code& ec) noexcept
return st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino;
#endif
}
- else if (!exists(s1) && !exists(s2))
+ else if (!exists(s1) || !exists(s2))
ec = std::make_error_code(std::errc::no_such_file_or_directory);
else if (err)
ec.assign(err, std::generic_category());
diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc
index 896a4918ace..e7481eb0e1b 100644
--- a/libstdc++-v3/src/filesystem/ops.cc
+++ b/libstdc++-v3/src/filesystem/ops.cc
@@ -764,7 +764,7 @@ fs::equivalent(const path& p1, const path& p2, error_code& ec) noexcept
return false;
return st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino;
}
- else if (!exists(s1) && !exists(s2))
+ else if (!exists(s1) || !exists(s2))
ec = std::make_error_code(std::errc::no_such_file_or_directory);
else if (err)
ec.assign(err, std::generic_category());
diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc
index 26bcd009360..9fe57430df3 100644
--- a/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc
@@ -34,13 +34,13 @@ test01()
bool result;
result = equivalent(p1, p2, ec);
- VERIFY( ec );
+ VERIFY( ec == std::errc::no_such_file_or_directory );
VERIFY( !result );
__gnu_test::scoped_file f1(p1);
ec = bad_ec;
result = equivalent(p1, p2, ec);
- VERIFY( !ec );
+ VERIFY( ec == std::errc::no_such_file_or_directory );
VERIFY( !result );
__gnu_test::scoped_file f2(p2);
diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/equivalent.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/equivalent.cc
index 618d4be24b4..84e4835b3cb 100644
--- a/libstdc++-v3/testsuite/experimental/filesystem/operations/equivalent.cc
+++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/equivalent.cc
@@ -35,13 +35,13 @@ test01()
bool result;
result = equivalent(p1, p2, ec);
- VERIFY( ec );
+ VERIFY( ec == std::errc::no_such_file_or_directory );
VERIFY( !result );
const auto bad_ec = ec;
__gnu_test::scoped_file f1(p1);
result = equivalent(p1, p2, ec);
- VERIFY( !ec );
+ VERIFY( ec == std::errc::no_such_file_or_directory );
VERIFY( !result );
__gnu_test::scoped_file f2(p2);
More information about the Libstdc++-cvs
mailing list