Skip to content

<filesystem>: Fix the path returned when there is an error with temp_directory_path #5570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2025
Merged

<filesystem>: Fix the path returned when there is an error with temp_directory_path #5570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions stl/inc/filesystem
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ namespace filesystem {
friend class _Path_iterator;
friend inline path absolute(const path& _Input, error_code& _Ec);
friend inline __std_win_error _Canonical(path& _Result, const wstring& _Text);
friend inline path temp_directory_path(error_code& _Ec);
friend inline path _Temp_directory_path_impl(error_code& _Ec);
friend inline path current_path(error_code& _Ec);
friend inline void current_path(const path& _To);
friend inline void current_path(const path& _To, error_code& _Ec) noexcept;
Expand Down Expand Up @@ -4039,9 +4039,8 @@ namespace filesystem {
_STD filesystem::permissions(_Target, _Perms, perm_options::replace, _Ec);
}

_EXPORT_STD _NODISCARD inline path temp_directory_path(error_code& _Ec) {
_NODISCARD inline path _Temp_directory_path_impl(error_code& _Ec) {
// get a location suitable for temporary storage, and verify that it is a directory
_Ec.clear(); // for exception safety
path _Result;
_Result._Text.resize(__std_fs_temp_path_max);
const auto _Temp_result = __std_fs_get_temp_path(_Result._Text.data());
Expand All @@ -4055,13 +4054,25 @@ namespace filesystem {
return _Result;
}

_EXPORT_STD _NODISCARD inline path temp_directory_path(error_code& _Ec) {
_Ec.clear(); // for exception safety
path _Result(_STD filesystem::_Temp_directory_path_impl(_Ec));
if (_Ec) {
// returns path() if an error occurs. (N5008 [fs.op.temp.dir.path]/3)
return {};
}

return _Result;
}

_EXPORT_STD _NODISCARD inline path temp_directory_path() {
// get a location suitable for temporary storage, and verify that it is a directory
error_code _Ec; // unusual arrangement to allow thrown error_code to have generic_category()
path _Result(_STD filesystem::temp_directory_path(_Ec));
path _Result(_STD filesystem::_Temp_directory_path_impl(_Ec));
if (_Ec) {
_Throw_fs_error("temp_directory_path", _Ec, _Result);
}

return _Result;
}

Expand Down
3 changes: 2 additions & 1 deletion tests/std/tests/P0218R1_filesystem/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3576,7 +3576,8 @@ void test_temp_directory_path() {
}

const auto nonexistentTemp = temp_directory_path(ec).native();
EXPECT(nonexistentTemp.find(LR"(\nonexistent.dir\)") == nonexistentTemp.size() - 17);
// returns path() if an error occurs. (N5008 [fs.op.temp.dir.path]/3)
EXPECT(nonexistentTemp.empty());
EXPECT(ec == make_error_code(errc::not_a_directory));

// TODO: automated test is_directory(p) is false, symlinks, after other filesystem components are implemented
Expand Down