Add zone1970.tab to the list of files

that should be ignored by init_tzdb() under USE_OS_TZDB.
This commit is contained in:
Howard Hinnant
2017-06-14 20:48:19 -04:00
parent 1139c9b64f
commit 88890939d5

15
tz.cpp
View File

@@ -2347,13 +2347,14 @@ init_tzdb()
while ((d = readdir(dir)) != nullptr) while ((d = readdir(dir)) != nullptr)
{ {
// Ignore these files: // Ignore these files:
if (d->d_name[0] == '.' || // curdir, prevdir, hidden if (d->d_name[0] == '.' || // curdir, prevdir, hidden
memcmp(d->d_name, "posix", 5) == 0 || // starts with posix memcmp(d->d_name, "posix", 5) == 0 || // starts with posix
strcmp(d->d_name, "Factory") == 0 || strcmp(d->d_name, "Factory") == 0 ||
strcmp(d->d_name, "iso3166.tab") == 0 || strcmp(d->d_name, "iso3166.tab") == 0 ||
strcmp(d->d_name, "right") == 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, "zone.tab") == 0 ||
strcmp(d->d_name, "zone1970.tab") == 0 )
continue; continue;
auto subname = dirname + folder_delimiter + d->d_name; auto subname = dirname + folder_delimiter + d->d_name;
if(stat(subname.c_str(), &s) == 0) if(stat(subname.c_str(), &s) == 0)