diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2021-07-20 18:15:48 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2021-07-20 20:34:47 +0100 |
commit | 124eaa50e0a34f5f89572c1aa812c50979da58fc (patch) | |
tree | 83477330e7dcdfb005f08c179036658a82edf3c1 /libstdc++-v3/testsuite/experimental/filesystem | |
parent | e07d30fdcaec4906e0dcb948fc4748bf74c15c05 (diff) | |
download | gcc-124eaa50e0a34f5f89572c1aa812c50979da58fc.zip gcc-124eaa50e0a34f5f89572c1aa812c50979da58fc.tar.gz gcc-124eaa50e0a34f5f89572c1aa812c50979da58fc.tar.bz2 |
libstdc++: Fix create_directories to resolve symlinks [PR101510]
When filesystem__create_directories checks to see if the path already
exists and resovles 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 <jwakely@redhat.com>
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:
* testsuite/27_io/filesystem/operations/create_directory.cc: Do
not test with symlinks on Windows.
* testsuite/experimental/filesystem/operations/create_directories.cc:
* testsuite/experimental/filesystem/operations/create_directory.cc:
Do not test with symlinks on Windows.
Diffstat (limited to 'libstdc++-v3/testsuite/experimental/filesystem')
-rw-r--r-- | libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc | 23 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc | 4 |
2 files changed, 27 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc index fb26400..fc134ad 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 39f95b6..8e36b76 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); } |