From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 9FECA3857703; Fri, 1 Sep 2023 15:02:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9FECA3857703 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1693580544; bh=y2iwVqB4Fz3t4m3Vg3YUvLK+AFESMzIDk4jqw/1dsgA=; h=From:To:Subject:Date:From; b=lf1S/NDvsH0P9OqdYHU52ymRhb54cwZl+nUC0DBfsK9WHFMV96sB6GPtZiW4ixjAc v3S9uN+qIaZSwWZJnpRFCgKQBqIasnsCW+fOxkgf4XAeyotmw8G2RjePOavxlWpXgh W5/7+gLYI/+yuuiF9PNeGd7VXgMcfBogQ6JcpRfs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-3626] libstdc++: Use std::string::__resize_and_overwrite in std::filesystem X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: dcbec954fcba42d97760c6bd98a4c5618473ec93 X-Git-Newrev: 283994cba687e0746f9a1018bae2c41291e362ff Message-Id: <20230901150224.9FECA3857703@sourceware.org> Date: Fri, 1 Sep 2023 15:02:24 +0000 (GMT) List-Id: https://gcc.gnu.org/g:283994cba687e0746f9a1018bae2c41291e362ff commit r14-3626-g283994cba687e0746f9a1018bae2c41291e362ff Author: Jonathan Wakely Date: Thu Aug 17 18:50:36 2023 +0100 libstdc++: Use std::string::__resize_and_overwrite in std::filesystem There are a few places in the std::filesystem code that use a string as a buffer for OS APIs to write to. We can use the new extension __resize_and_overwrite to avoid redundant initialization of those buffers. libstdc++-v3/ChangeLog: * src/c++17/fs_ops.cc (fs::absolute) [FILESYSTEM_IS_WINDOWS]: Use __resize_and_overwrite to fill buffer. (fs::read_symlink) [HAVE_READLINK]: Likewise. * src/filesystem/ops-common.h (get_temp_directory_from_env) [FILESYSTEM_IS_WINDOWS]: Likewise. Diff: --- libstdc++-v3/src/c++17/fs_ops.cc | 45 ++++++++++++++++---------------- libstdc++-v3/src/filesystem/ops-common.h | 7 ++--- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index c94d260632f6..6cdeac17c33c 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -112,18 +112,17 @@ fs::absolute(const path& p, error_code& ec) wstring buf; do { - buf.resize(len); - len = GetFullPathNameW(s.data(), len, buf.data(), nullptr); + buf.__resize_and_overwrite(len, [&s, &len](wchar_t* p, unsigned n) { + len = GetFullPathNameW(s.data(), n, p, nullptr); + return len > n ? 0 : len; + }); } while (len > buf.size()); if (len == 0) ec = __last_system_error(); else - { - buf.resize(len); - ret = std::move(buf); - } + ret = std::move(buf); #else ret = current_path(ec); ret /= p; @@ -1187,31 +1186,33 @@ fs::path fs::read_symlink(const path& p, error_code& ec) return result; } - std::string buf(st.st_size ? st.st_size + 1 : 128, '\0'); + std::string buf; + size_t bufsz = st.st_size ? st.st_size + 1 : 128; do { - ssize_t len = ::readlink(p.c_str(), buf.data(), buf.size()); - if (len == -1) + ssize_t len; + buf.__resize_and_overwrite(bufsz, [&p, &len](char* ptr, size_t n) { + len = ::readlink(p.c_str(), ptr, n); + return size_t(len) < n ? len : 0; + }); + if (buf.size()) + { + result.assign(std::move(buf)); + ec.clear(); + break; + } + else if (len == -1) { ec.assign(errno, std::generic_category()); return result; } - else if (len == (ssize_t)buf.size()) + else if (bufsz > 4096) { - if (buf.size() > 4096) - { - ec.assign(ENAMETOOLONG, std::generic_category()); - return result; - } - buf.resize(buf.size() * 2); + ec.assign(ENAMETOOLONG, std::generic_category()); + return result; } else - { - buf.resize(len); - result.assign(buf); - ec.clear(); - break; - } + bufsz *= 2; } while (true); #else diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index 2e4331bb6829..79dcb756453f 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -700,8 +700,10 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM std::wstring buf; do { - buf.resize(len); - len = GetTempPathW(buf.size(), buf.data()); + buf.__resize_and_overwrite(len, [&len](wchar_t* p, unsigned n) { + len = GetTempPathW(n, p); + return len > n ? 0 : len; + }); } while (len > buf.size()); @@ -710,7 +712,6 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM else ec.clear(); - buf.resize(len); return buf; } #else