public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5339] libstdc++: Use /etc/sysconfig/clock for std::chrono::current_zone() [PR108530] Date: Tue, 24 Jan 2023 23:51:41 +0000 (GMT) [thread overview] Message-ID: <20230124235141.7B9173858D33@sourceware.org> (raw) https://gcc.gnu.org/g:e00d5cafbe1a77772ecc57eec921ff0b7dd41344 commit r13-5339-ge00d5cafbe1a77772ecc57eec921ff0b7dd41344 Author: Jonathan Wakely <jwakely@redhat.com> Date: Tue Jan 24 23:43:24 2023 +0000 libstdc++: Use /etc/sysconfig/clock for std::chrono::current_zone() [PR108530] On some systems /etc/localtime is a tzfile, not a symlink to one. We cannot use it to determine the current time zone in that case. See if /etc/sysconfig/clock sets the variable DEFAULT_TIMEZONE instead. libstdc++-v3/ChangeLog: PR libstdc++/108530 * src/c++20/tzdb.cc (current_zone): Look for DEFAULT_TIMEZONE in /etc/sysconfig/clock. Diff: --- libstdc++-v3/src/c++20/tzdb.cc | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc index 20399b91e47..eb68111e444 100644 --- a/libstdc++-v3/src/c++20/tzdb.cc +++ b/libstdc++-v3/src/c++20/tzdb.cc @@ -62,8 +62,8 @@ #if ! __cpp_constinit # if __has_cpp_attribute(clang::require_constant_initialization) # define constinit [[clang::require_constant_initialization]] -#else // YOLO -# define constinit +# else // YOLO +# define constinit # endif #endif @@ -1663,6 +1663,26 @@ namespace std::chrono if (auto tz = do_locate_zone(this->zones, this->links, name)) return tz; } + + if (ifstream tzf{"/etc/sysconfig/clock"}) + { + string line; + string_view key = "DEFAULT_TIMEZONE="; + while (std::getline(tzf, line)) + if (line.starts_with(key)) + { + string_view name = line; + name.remove_prefix(key.size()); + if (name.size() != 0 && name.front() == '"') + { + name.remove_prefix(1); + if (auto pos = name.find('"'); pos != name.npos) + name = name.substr(0, pos); + } + if (auto tz = do_locate_zone(this->zones, this->links, name)) + return tz; + } + } #else // AIX stores current zone in $TZ in /etc/environment but the value // is typically a POSIX time zone name, not IANA zone.
reply other threads:[~2023-01-24 23:51 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230124235141.7B9173858D33@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@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: linkBe 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).