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

Also ignore leap-seconds.list

Browse Source 
The tzdata package on Ubuntu includes /usr/share/zoneinfo/leap-
seconds.list. This is not a TZif file, so it should be ignored.
This commit is contained in:
Roel Standaert
2017-06-29 13:22:04 +02:00
committed by Howard Hinnant
parent 090b66beb8
commit 7cbc4d8013
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tz.cpp
View File

@@ -2504,14 +2504,15 @@ 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 ) strcmp(d->d_name, "zone1970.tab") == 0 ||
strcmp(d->d_name, "leap-seconds.list") == 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)