[PATCH v2 1/2] libstdc++: Fix error handling in filesystem::equivalent [PR113250]

[Jonathan Wakely]

On Thu, 11 Jan 2024 at 09:43, Ken Matsui <kmatsui@gcc.gnu.org> wrote:
>
> This patch made std::filesystem::equivalent correctly throw an exception
> when either path does not exist as per [fs.op.equivalent]/4.

Thanks, OK for trunk and all active branches (let me know if you need
help backporting it).


>
> 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>
> ---
>  libstdc++-v3/src/c++17/fs_ops.cc                              | 2 +-
>  libstdc++-v3/src/filesystem/ops.cc                            | 2 +-
>  .../testsuite/27_io/filesystem/operations/equivalent.cc       | 4 ++--
>  .../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 e0b308a37ea..61df19753ef 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 eccdae3d910..4d23a804da0 100644
> --- a/libstdc++-v3/src/filesystem/ops.cc
> +++ b/libstdc++-v3/src/filesystem/ops.cc
> @@ -765,7 +765,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 78f6e368204..68f32366d65 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 929a6ca8609..5bc477a31cd 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);
> --
> 2.43.0
>