procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Use /etc/sysconfig/clock for std::chrono::current_zone() [PR108530]

Browse source 
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.
This commit is contained in:
Jonathan Wakely 2023-01-24 23:43:24 +00:00
parent 33ed110858
commit e00d5cafbe
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libstdc++-v3/src/c++20/tzdb.cc
View file

@ -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.