OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix experimental::filesystem::status on Windows [PR88881]

Browse Source 
Although the Filesystem TS isn't properly supported on Windows (unlike
the C++17 Filesystem lib), most tests do pass. Two of the failures are
due to PR 88881 which was only fixed for std::filesystem not the TS.
This applies the fix to the TS implementation too.

libstdc++-v3/ChangeLog:

	PR libstdc++/88881
	* src/filesystem/ops.cc (has_trailing_slash): New helper
	function.
	(fs::status): Strip trailing slashes.
	(fs::symlink_status): Likewise.
	* testsuite/experimental/filesystem/operations/temp_directory_path.cc:
	Clean the environment before each test and use TMP instead of
	TMPDIR so the test passes on Windows.

(cherry picked from commit 6c96b14a19)
This commit is contained in:
Jonathan Wakely 2022-06-28 15:56:30 +01:00
parent ade3197134
commit f3ff78e3db
2 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libstdc++-v3/src/filesystem/ops.cc
View File

@ -1176,13 +1176,43 @@ fs::space(const path& p, error_code& ec) noexcept
return info; return info;
} }
#if _GLIBCXX_FILESYSTEM_IS_WINDOWS
static bool has_trailing_slash(const fs::path& p)
{
wchar_t c = p.native().back();
return c == '/' || c == L'\\';
}
#endif
#ifdef _GLIBCXX_HAVE_SYS_STAT_H #ifdef _GLIBCXX_HAVE_SYS_STAT_H
fs::file_status fs::file_status
fs::status(const fs::path& p, error_code& ec) noexcept fs::status(const fs::path& p, error_code& ec) noexcept
{ {
file_status status; file_status status;
auto str = p.c_str();
#if _GLIBCXX_FILESYSTEM_IS_WINDOWS
// stat() fails if there's a trailing slash (PR 88881)
path p2;
if (p.has_relative_path() && has_trailing_slash(p))
{
__try
{
p2 = p.parent_path();
str = p2.c_str();
}
__catch(const bad_alloc&)
{
ec = std::make_error_code(std::errc::not_enough_memory);
return status;
}
str = p2.c_str();
}
#endif
stat_type st; stat_type st;
if (posix::stat(p.c_str(), &st)) if (posix::stat(str, &st))
{ {
int err = errno; int err = errno;
ec.assign(err, std::generic_category()); ec.assign(err, std::generic_category());
@ -1205,8 +1235,30 @@ fs::file_status
fs::symlink_status(const fs::path& p, std::error_code& ec) noexcept fs::symlink_status(const fs::path& p, std::error_code& ec) noexcept
{ {
file_status status; file_status status;
auto str = p.c_str();
#if _GLIBCXX_FILESYSTEM_IS_WINDOWS
// stat() fails if there's a trailing slash (PR 88881)
path p2;
if (p.has_relative_path() && has_trailing_slash(p))
{
__try
{
p2 = p.parent_path();
str = p2.c_str();
}
__catch(const bad_alloc&)
{
ec = std::make_error_code(std::errc::not_enough_memory);
return status;
}
str = p2.c_str();
}
#endif
stat_type st; stat_type st;
if (posix::lstat(p.c_str(), &st)) if (posix::lstat(str, &st))
{ {
int err = errno; int err = errno;
ec.assign(err, std::generic_category()); ec.assign(err, std::generic_category());

6
libstdc++-v3/testsuite/experimental/filesystem/operations/temp_directory_path.cc
View File

@ -105,6 +105,8 @@ test03()
if (!__gnu_test::permissions_are_testable()) if (!__gnu_test::permissions_are_testable())
return; return;
clean_env();
auto p = __gnu_test::nonexistent_path(); auto p = __gnu_test::nonexistent_path();
create_directories(p/"tmp"); create_directories(p/"tmp");
permissions(p, fs::perms::none); permissions(p, fs::perms::none);
@ -129,8 +131,10 @@ test03()
void void
test04() test04()
{ {
clean_env();
__gnu_test::scoped_file f; __gnu_test::scoped_file f;
set_env("TMPDIR", f.path.string()); set_env("TMP", f.path.string());
std::error_code ec; std::error_code ec;
auto r = fs::temp_directory_path(ec); auto r = fs::temp_directory_path(ec);
VERIFY( ec == std::make_error_code(std::errc::not_a_directory) ); VERIFY( ec == std::make_error_code(std::errc::not_a_directory) );