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

libstdc++: Fix filesystem::temp_directory_path [PR101709]

Browse source 
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	PR libstdc++/101709
	* src/filesystem/ops-common.h (get_temp_directory_from_env):
	Add error_code parameter.
	* src/c++17/fs_ops.cc (fs::temp_directory_path): Pass error_code
	argument to get_temp_directory_from_env and check it.
	* src/filesystem/ops.cc (fs::temp_directory_path): Likewise.
This commit is contained in:
Jonathan Wakely 2021-08-02 15:52:41 +01:00
parent 2aaf69133f
commit 38fb24ba4d
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1604,7 +1604,9 @@ fs::temp_directory_path()
fs::path
fs::temp_directory_path(error_code& ec)
{
path p = fs::get_temp_directory_from_env();
path p = fs::get_temp_directory_from_env(ec);
if (ec)
return p;
auto st = status(p, ec);
if (ec)
p.clear();

13
libstdc++-v3/src/filesystem/ops-common.h
View file

@ -572,7 +572,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
// Caller must check that the path is an accessible directory.
#ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS
inline wstring
get_temp_directory_from_env()
get_temp_directory_from_env(error_code& ec)
{
unsigned len = 1024;
std::wstring buf;
@ -583,17 +583,18 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM
} while (len > buf.size());
if (len == 0)
{
ec.assign((int)GetLastError(), std::system_category());
return p;
}
ec.assign((int)GetLastError(), std::system_category());
else
ec.clear();
buf.resize(len);
return buf;
}
#else
inline const char*
get_temp_directory_from_env() noexcept
get_temp_directory_from_env(error_code& ec) noexcept
{
ec.clear();
for (auto env : { "TMPDIR", "TMP", "TEMP", "TEMPDIR" })
{
#if _GLIBCXX_HAVE_SECURE_GETENV

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

@ -1302,7 +1302,9 @@ fs::temp_directory_path()
fs::path
fs::temp_directory_path(error_code& ec)
{
path p = fs::get_temp_directory_from_env();
path p = fs::get_temp_directory_from_env(ec);
if (ec)
return p;
auto st = status(p, ec);
if (ec)
p.clear();