summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <oliva@adacore.com>2022-06-27 10:34:16 -0300
committerJonathan Wakely <jwakely@redhat.com>2022-07-22 12:52:04 +0100
commit4eb15eceaac0bb900303986fc5164190d3692a0a (patch)
tree99a3e9b14b49f6eef3109ebb6fa6909dc9072649
parentca82e7900f40d240f246371c376d0c6fb126b5a0 (diff)
libstdc++: check for openat with dirfd in std::filesystem
In the recent patch to check for openat, I missed an occurrence of dirfd in std::filesystem. for libstdc++-v3/ChangeLog * src/c++17/fs_dir.cc (dir_and_pathname): Use dirfd if _GLIBCXX_HAVE_OPENAT. (cherry picked from commit 486893b1d325d22d54c1380937943913a7501f91)
-rw-r--r--libstdc++-v3/src/c++17/fs_dir.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/src/c++17/fs_dir.cc b/libstdc++-v3/src/c++17/fs_dir.cc
index c67fe76bc14..25b33baa875 100644
--- a/libstdc++-v3/src/c++17/fs_dir.cc
+++ b/libstdc++-v3/src/c++17/fs_dir.cc
@@ -124,7 +124,7 @@ struct fs::_Dir : _Dir_base
dir_and_pathname() const noexcept
{
const fs::path& p = entry.path();
-#if _GLIBCXX_HAVE_DIRFD
+#if _GLIBCXX_HAVE_DIRFD && _GLIBCXX_HAVE_OPENAT
if (!p.empty())
return {::dirfd(this->dirp), std::prev(p.end())->c_str()};
#endif