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-5385] libstdc++: Fix strings read from /etc/sysconfig/clock [PR108530] Date: Thu, 26 Jan 2023 13:38:31 +0000 (GMT) [thread overview] Message-ID: <20230126133831.1DCA03858C62@sourceware.org> (raw) https://gcc.gnu.org/g:93e2bf51dedd0870b78b770b72e34b15a7a0d14a commit r13-5385-g93e2bf51dedd0870b78b770b72e34b15a7a0d14a Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Jan 26 09:26:35 2023 +0000 libstdc++: Fix strings read from /etc/sysconfig/clock [PR108530] In r13-5339-ge00d5cafbe1a77 I made std::chrono::current_zone() look for DEFAULT_TIMEZONE in /etc/sysconfig/clock but that is the wrong variable. Old Suse systems use TIMEZONE to determine which zone /etc/localtime is a copy of, and old RHEL system use ZONE. libstdc++-v3/ChangeLog: PR libstdc++/108530 * src/c++20/tzdb.cc (current_zone): Look for TIMEZONE or ZONE in /etc/sysconfig/clock, not DEFAULT_TIMEZONE. Diff: --- libstdc++-v3/src/c++20/tzdb.cc | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc index eb68111e444..c945f002ad7 100644 --- a/libstdc++-v3/src/c++20/tzdb.cc +++ b/libstdc++-v3/src/c++20/tzdb.cc @@ -1667,21 +1667,23 @@ namespace std::chrono if (ifstream tzf{"/etc/sysconfig/clock"}) { string line; - string_view key = "DEFAULT_TIMEZONE="; + // Old versions of Suse use TIMEZONE. Old versions of RHEL use ZONE. + const string_view keys[] = { "TIMEZONE=" , "ZONE=" }; 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; - } + for (string_view key : keys) + 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
reply other threads:[~2023-01-26 13:38 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=20230126133831.1DCA03858C62@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).