3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-27 08:31:03 +08:00
Code Issues Projects Releases Wiki Activity

Improve current_zone().

Browse Source 
Fixes #454
This commit is contained in:
Howard Hinnant 2019-09-05 18:12:35 -04:00
parent e6d2c08159
commit 4481c75192
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tz.cpp
View File

@ -3692,16 +3692,26 @@ tzdb::current_zone() const
CONSTDATA auto timezone = "/etc/localtime"; CONSTDATA auto timezone = "/etc/localtime";
if (lstat(timezone, &sb) == 0 && S_ISLNK(sb.st_mode) && sb.st_size > 0) { if (lstat(timezone, &sb) == 0 && S_ISLNK(sb.st_mode) && sb.st_size > 0) {
using namespace std; using namespace std;
string result;
char rp[PATH_MAX+1] = {}; char rp[PATH_MAX+1] = {};
if (readlink(timezone, rp, sizeof(rp)-1) > 0) if (realpath(timezone, rp) == nullptr)
result = string(rp); throw system_error(errno, system_category(), "realpath() failed");
else #if HAS_STRING_VIEW
throw system_error(errno, system_category(), "readlink() failed"); string_view result = rp;
CONSTDATA string_view zoneinfo = "/zoneinfo/";
const size_t pos = result.find(get_tz_dir()); const size_t pos = result.rfind(zoneinfo);
if (pos != result.npos) if (pos == result.npos)
result.erase(0, get_tz_dir().size() + 1 + pos); throw runtime_error(
"current_zone() failed to find \"/zoneinfo/\" in " + string(result));
result.remove_prefix(pos + zoneinfo.size());
#else
string result = rp;
CONSTDATA char zoneinfo[] = "/zoneinfo/";
const size_t pos = result.rfind(zoneinfo);
if (pos == result.npos)
throw runtime_error(
"current_zone() failed to find \"/zoneinfo/\" in " + result);
result.erase(0, pos + sizeof(zoneinfo) - 1);
#endif
return locate_zone(result); return locate_zone(result);
} }
} }