feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Skip "version" file and USE_OS_TZDB to return "unknown" if no version found (#616)

Browse Source 
In commit commit 0b72599bd4 there
was a change to read "version" in addition to "+VERSION", so that
file shold also be ignored when scanning/reading zonefiles.

Also before the above mentioed commit get_version() would return
"unknown" if not on __APPLE__ and the version file was not found.
Put back that behaviour, for all USE_OS_TZDB users.

This last change changes the behaviour for __APPLE__ from throwing
an exception to returning "unknown".

Co-authored-by: Lars Gullik Bjønnes <lbjonnes@cisco.com>
This commit is contained in:
LarsGullik
2020-10-27 15:08:30 +01:00
committed by GitHub
parent 215cacff56
commit 432bab81f9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tz.cpp
View File

@ -2651,7 +2651,7 @@ get_version()
in >> version;
return version;
}
return version;
return "unknown";
}
static
@ -2760,6 +2760,7 @@ init_tzdb()
strcmp(d->d_name, "iso3166.tab") == 0 ||
strcmp(d->d_name, "right") == 0 ||
strcmp(d->d_name, "+VERSION") == 0 ||
strcmp(d->d_name, "version") == 0 ||
strcmp(d->d_name, "zone.tab") == 0 ||
strcmp(d->d_name, "zone1970.tab") == 0 ||
strcmp(d->d_name, "tzdata.zi") == 0 ||