procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix create_directories to resolve symlinks [PR101510]

Browse source 
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.
This commit is contained in:
Jonathan Wakely 2021-07-20 18:15:48 +01:00
parent e07d30fdca
commit 124eaa50e0
6 changed files with 56 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libstdc++-v3/src/c++17/fs_ops.cc
View file

@ -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))

2
libstdc++-v3/src/filesystem/ops.cc
View file

@ -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))

23
libstdc++-v3/testsuite/27_io/filesystem/operations/create_directories.cc
View file

@ -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();
}

4
libstdc++-v3/testsuite/27_io/filesystem/operations/create_directory.cc
View file

@ -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);
}

23
libstdc++-v3/testsuite/experimental/filesystem/operations/create_directories.cc
View file

@ -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();
}

4
libstdc++-v3/testsuite/experimental/filesystem/operations/create_directory.cc
View file

@ -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);
}