From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 01DDE3858433 for ; Thu, 26 Jan 2023 13:39:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 01DDE3858433 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674740345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iECbTNnOnqCBaO8XUHcONGSRbnHvm2uWNkO23ZabZuE=; b=L5r2wpx0ltvsI1A84iCf5EnS61wUMiPJXvy/jOhZNt3n3h/eiO+p07t6lsnN5YK/gWScKt Km+lBCUPoBeTmJguXsq/PuH6x2f3OPDzspOMCvb+xlCOYo848YOpXxdE8b01uBy61P4+qG 0v+cWPmvidnTHynaj2EyITE2cTnZ4fo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-516-URfBwywjNz27yb_dMTP02Q-1; Thu, 26 Jan 2023 08:39:02 -0500 X-MC-Unique: URfBwywjNz27yb_dMTP02Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70A4A3806622; Thu, 26 Jan 2023 13:39:02 +0000 (UTC) Received: from localhost (unknown [10.33.36.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31BA8C15BA0; Thu, 26 Jan 2023 13:39:02 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix strings read from /etc/sysconfig/clock [PR108530] Date: Thu, 26 Jan 2023 13:39:01 +0000 Message-Id: <20230126133901.1428898-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested x86_64-linux (Fedora 36 and RHEL 6.10). Pushed to trunk. -- >8 -- 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. --- 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 -- 2.39.1