From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Fix filesystem::temp_directory_path [PR101709]
Date: Mon, 2 Aug 2021 16:35:45 +0100 [thread overview]
Message-ID: <YQgQ0ZwAX1Vw2x1w@redhat.com> (raw)
In-Reply-To: <YQQzVAz7if80tW/5@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 1065 bytes --]
On 30/07/21 18:13 +0100, Jonathan Wakely wrote:
>This adds a configure check for the GNU extension secure_getenv and then
>uses it for looking up TMPDIR and similar variables.
>
>Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
>
>libstdc++-v3/ChangeLog:
>
> PR libstdc++/65018
> * configure.ac: Check for secure_getenv.
> * config.h.in: Regenerate.
> * configure: Regenerate.
> * src/filesystem/ops-common.h (get_temp_directory_from_env): New
> helper function to obtain path from the environment.
> * src/c++17/fs_ops.cc (fs::temp_directory_path): Use new helper.
> * src/filesystem/ops.cc (fs::temp_directory_path): Likewise.
> * testsuite/27_io/filesystem/operations/temp_directory_path.cc:
> Print messages if test cannot be run.
> * testsuite/experimental/filesystem/operations/temp_directory_path.cc:
> Likewise. Fix incorrect condition. Use "TMP" to work with
> Windows as well as POSIX.
This refactoring broke the Windows build. Fixed like so.
Tested powerpc64le-linux and x86_64-w64-mingw32 (cross-compiled and
run under Wine). Committed to trunk.
[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 2741 bytes --]
commit 38fb24ba4d67254cea78731fc8d961903dad9646
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Mon Aug 2 15:52:41 2021
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.
diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc
index db2250e4841..0e2d952673f 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 b8bbf446883..304e5b263fb 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 3494cbd19f9..b0a0f15e98f 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();
prev parent reply other threads:[~2021-08-02 15:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 17:13 [committed] libstdc++: Use secure_getenv for filesystem::temp_directory_path() [PR65018] Jonathan Wakely
2021-08-02 15:35 ` Jonathan Wakely [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YQgQ0ZwAX1Vw2x1w@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).