From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 1DCA03858C62; Thu, 26 Jan 2023 13:38:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1DCA03858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674740311; bh=x1jPA3dNf9Teuz22oq1ZPoHUtziT9cOojHDD/EF/ZI4=; h=From:To:Subject:Date:From; b=AnChX2PeFKTkgkznwRXvpF2rCrrF47bST0qFcN16WeAA/XKozzGQHnpuzGQU6uU4U IJVgWpDlhVG8ucW6ho7VatJukTxUmmrgsNXihB4jq+5QB911m7Zn+v3Z9KSvyvquci WRoiOJFEAR42sy/yql17EdJ7oXVR+cvjPb2Fnong= 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 r13-5385] libstdc++: Fix strings read from /etc/sysconfig/clock [PR108530] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e75b2c67e56f1c4f532e76798afab98155805f78 X-Git-Newrev: 93e2bf51dedd0870b78b770b72e34b15a7a0d14a Message-Id: <20230126133831.1DCA03858C62@sourceware.org> Date: Thu, 26 Jan 2023 13:38:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:93e2bf51dedd0870b78b770b72e34b15a7a0d14a commit r13-5385-g93e2bf51dedd0870b78b770b72e34b15a7a0d14a Author: Jonathan Wakely 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