From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id CB9403982419; Wed, 11 Aug 2021 15:42:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB9403982419 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-8850] libstdc++: Fix create_directories to resolve symlinks [PR101510] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: c5f17274aabe61bb0193b8b68283c1f1da5ee699 X-Git-Newrev: bde28c60c70079416dd2181f882c0694e019eaef Message-Id: <20210811154253.CB9403982419@sourceware.org> Date: Wed, 11 Aug 2021 15:42:53 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2021 15:42:53 -0000 https://gcc.gnu.org/g:bde28c60c70079416dd2181f882c0694e019eaef commit r11-8850-gbde28c60c70079416dd2181f882c0694e019eaef Author: Jonathan Wakely Date: Tue Jul 20 18:15:48 2021 +0100 libstdc++: Fix create_directories to resolve symlinks [PR101510] When filesystem__create_directories checks to see if the path already exists and resolves to a directory, it uses filesystem::symlink_status, which means it reports an error if the path is a symlink. It should use filesystem::status, so that the target directory is detected, and no error is reported. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/101510 * src/c++17/fs_ops.cc (fs::create_directories): Use status instead of symlink_status. * src/filesystem/ops.cc (fs::create_directories): Likewise. * testsuite/27_io/filesystem/operations/create_directories.cc: Check symlink to existing directory. * testsuite/27_io/filesystem/operations/create_directory.cc: Do not test with symlinks on Windows. * testsuite/experimental/filesystem/operations/create_directories.cc: Check symlink to existing directory. * testsuite/experimental/filesystem/operations/create_directory.cc: Do not test with symlinks on Windows. (cherry picked from commit 124eaa50e0a34f5f89572c1aa812c50979da58fc) Diff: --- libstdc++-v3/src/c++17/fs_ops.cc | 2 +- libstdc++-v3/src/filesystem/ops.cc | 2 +- .../filesystem/operations/create_directories.cc | 23 ++++++++++++++++++++++ .../filesystem/operations/create_directory.cc | 4 ++++ .../filesystem/operations/create_directories.cc | 23 ++++++++++++++++++++++ .../filesystem/operations/create_directory.cc | 4 ++++ 6 files changed, 56 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index cec76446f06..ceaf0291d64 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -496,7 +496,7 @@ fs::create_directories(const path& p, error_code& ec) return false; } - file_status st = symlink_status(p, ec); + file_status st = status(p, ec); if (is_directory(st)) return false; else if (ec && !status_known(st)) diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index c400376d224..7c5b164fb7f 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -426,7 +426,7 @@ fs::create_directories(const path& p, error_code& ec) noexcept return false; } - file_status st = symlink_status(p, ec); + file_status st = status(p, ec); if (is_directory(st)) return false; else if (ec && !status_known(st)) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc index 393d6a55309..304c1453afe 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc @@ -145,10 +145,33 @@ test03() remove_all(p); } +void +test04() +{ +#if defined(__MINGW32__) || defined(__MINGW64__) + // no symlinks +#else + // PR libstdc++/101510 + // create_directories reports an error if the path is a symlink to a dir + std::error_code ec = make_error_code(std::errc::invalid_argument); + const auto p = __gnu_test::nonexistent_path() / ""; + fs::create_directories(p/"dir"); + auto link = p/"link"; + fs::create_directory_symlink("dir", link); + bool created = fs::create_directories(link, ec); + VERIFY( !created ); + VERIFY( !ec ); + created = fs::create_directories(link); + VERIFY( !created ); + remove_all(p); +#endif +} + int main() { test01(); test02(); test03(); + test04(); } diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc index 256621481d7..afddccf5ed6 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc @@ -70,6 +70,9 @@ test01() VERIFY( e.path1() == f ); } +#if defined(__MINGW32__) || defined(__MINGW64__) + // no symlinks +#else // PR libstdc++/101510 create_directory on an existing symlink to a directory fs::create_directory(p/"dir"); auto link = p/"link"; @@ -80,6 +83,7 @@ test01() VERIFY( !ec ); b = fs::create_directory(link); VERIFY( !b ); +#endif remove_all(p, ec); } diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc index fb264002b69..fc134ad64a3 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc @@ -129,10 +129,33 @@ test03() remove_all(p); } +void +test04() +{ +#if defined(__MINGW32__) || defined(__MINGW64__) + // no symlinks +#else + // PR libstdc++/101510 + // create_directories reports an error if the path is a symlink to a dir + std::error_code ec = make_error_code(std::errc::invalid_argument); + const auto p = __gnu_test::nonexistent_path() / ""; + fs::create_directories(p/"dir"); + auto link = p/"link"; + fs::create_directory_symlink("dir", link); + bool created = fs::create_directories(link, ec); + VERIFY( !created ); + VERIFY( !ec ); + created = fs::create_directories(link); + VERIFY( !created ); + remove_all(p); +#endif +} + int main() { test01(); test02(); test03(); + test04(); } diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc index 39f95b61a45..8e36b762a25 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc @@ -69,6 +69,9 @@ test01() VERIFY( e.path1() == f ); } +#if defined(__MINGW32__) || defined(__MINGW64__) + // no symlinks +#else // PR libstdc++/101510 create_directory on an existing symlink to a directory fs::create_directory(p/"dir"); auto link = p/"link"; @@ -79,6 +82,7 @@ test01() VERIFY( !ec ); b = fs::create_directory(link); VERIFY( !b ); +#endif remove_all(p, ec); }