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-5170] libstdc++: Implement std::chrono::current_zone() for AIX [PR108409] Date: Sat, 14 Jan 2023 21:59:32 +0000 (GMT) [thread overview] Message-ID: <20230114215932.BF81F3858D1E@sourceware.org> (raw) https://gcc.gnu.org/g:d80e5a7b30e5d045c808f5235123e366e4e9286c commit r13-5170-gd80e5a7b30e5d045c808f5235123e366e4e9286c Author: Jonathan Wakely <jwakely@redhat.com> Date: Sat Jan 14 20:13:32 2023 +0000 libstdc++: Implement std::chrono::current_zone() for AIX [PR108409] libstdc++-v3/ChangeLog: PR libstdc++/108409 * src/c++20/tzdb.cc (current_zone()) [_AIX]: Use TZ environment variable. Diff: --- libstdc++-v3/src/c++20/tzdb.cc | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc index a37859dffdb..eaaea367f4f 100644 --- a/libstdc++-v3/src/c++20/tzdb.cc +++ b/libstdc++-v3/src/c++20/tzdb.cc @@ -34,6 +34,10 @@ #include <mutex> // mutex #include <filesystem> // filesystem::read_symlink +#ifndef _AIX +# include <cstdlib> // getenv +#endif + #ifndef __GTHREADS # define USE_ATOMIC_SHARED_PTR 0 #elif _WIN32 @@ -1625,6 +1629,7 @@ namespace std::chrono { // TODO cache this function's result? +#ifndef _AIX error_code ec; // This should be a symlink to e.g. /usr/share/zoneinfo/Europe/London auto path = filesystem::read_symlink("/etc/localtime", ec); @@ -1655,11 +1660,25 @@ namespace std::chrono if (auto tz = do_locate_zone(this->zones, this->links, name)) return tz; } - - // TODO AIX stores current zone in $TZ in /etc/environment but the value +#else + // AIX stores current zone in $TZ in /etc/environment but the value // is typically a POSIX time zone name, not IANA zone. // https://developer.ibm.com/articles/au-aix-posix/ // https://www.ibm.com/support/pages/managing-time-zone-variable-posix + if (const char* env = std::getenv("TZ")) + { + string_view s(env); + if (s == "GMT0") + s = "Etc/GMT"; + else if (s.size() == 4 && s[3] == '0') + s = "Etc/UTC"; + + // This will fail unless TZ contains an IANA time zone name, + // or one of the special cases above. + if (auto tz = do_locate_zone(this->zones, this->links, s)) + return tz; + } +#endif __throw_runtime_error("tzdb: cannot determine current zone"); }
reply other threads:[~2023-01-14 21:59 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=20230114215932.BF81F3858D1E@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).