diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-08-02 15:52:41 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-08-02 16:33:44 +0100 |
| commit | 38fb24ba4d67254cea78731fc8d961903dad9646 (patch) | |
| tree | ecfe14aa82cb148abde2bc5e562d8e4571d9cd81 /libstdc++-v3/src | |
| parent | 2aaf69133f39f2409baa146e755a6c52eee4452f (diff) | |
| download | gcc-38fb24ba4d67254cea78731fc8d961903dad9646.zip gcc-38fb24ba4d67254cea78731fc8d961903dad9646.tar.gz gcc-38fb24ba4d67254cea78731fc8d961903dad9646.tar.bz2 | |
libstdc++: Fix filesystem::temp_directory_path [PR101709]
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.
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/c++17/fs_ops.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/filesystem/ops-common.h | 13 | ||||
| -rw-r--r-- | libstdc++-v3/src/filesystem/ops.cc | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index db2250e..0e2d952 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -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(); diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index b8bbf44..304e5b2 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -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 diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index 3494cbd..b0a0f15 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -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(); |