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.129.124]) by sourceware.org (Postfix) with ESMTPS id 84D4C3858C27 for ; Tue, 24 Jan 2023 23:52:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 84D4C3858C27 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=1674604320; 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=NsPzmQ7Sq2dikOntC9y+VN82NRAmouC7UC5ujuGoHkk=; b=J49OfzBFOTj0nHgEi+eE6NwG/GNUuhEVNwWdPgc3zBdRpVJ3ZSvXxHH2YGupEEqyjiSeQt LkK2AB42QNiu2Zb72Qq9wQ3bsg2sKyAWCe6269GKDFOlLdiZkqskQX4Iin5UP7E4SrngBb Osx3Z3tGdruKD9F44myUzmZaBoB5PsU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-3-bFVZplYDP6qRvL5Xf0weSA-1; Tue, 24 Jan 2023 18:51:58 -0500 X-MC-Unique: bFVZplYDP6qRvL5Xf0weSA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E14C101A521; Tue, 24 Jan 2023 23:51:58 +0000 (UTC) Received: from localhost (unknown [10.33.36.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D1DC2166B26; Tue, 24 Jan 2023 23:51:58 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Use /etc/sysconfig/clock for std::chrono::current_zone() [PR108530] Date: Tue, 24 Jan 2023 23:51:57 +0000 Message-Id: <20230124235157.1186160-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 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=ham 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. Pushed to trunk. -- >8 -- 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. --- 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. -- 2.39.1