Skip to content

ADD settable zoneinfo directory functions #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wabscale wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ADD settable zoneinfo directory functions #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions include/date/tz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,6 +1299,14 @@ DATE_API tzdb_list& get_tzdb_list();
DATE_API const tzdb& reload_tzdb();
DATE_API void set_install(const std::string& install);

#else // USE_OS_TZDB

static
std::string& get_user_tz_dir();

void
set_tz_dir(const std::string& tz_dir);

#endif // !USE_OS_TZDB

#if HAS_REMOTE_API
Expand Down
19 changes: 18 additions & 1 deletion src/tz.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,20 @@ get_download_gz_file(const std::string& version)
}
#endif // HAS_REMOTE_API

#else // USE_OS_TZDB

static
std::string& get_user_tz_dir()
{
static std::string tz_dir = "/usr/share/zoneinfo";
return tz_dir;
}

void
set_tz_dir(const std::string& tz_dir)
{
get_user_tz_dir() = tz_dir;
}
#endif // !USE_OS_TZDB

// These can be used to reduce the range of the database to save memory
Expand All @@ -350,11 +364,14 @@ discover_tz_dir()
struct stat sb;
using namespace std;
# ifndef __APPLE__
auto tz_dir_user = get_user_tz_dir().c_str();
CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo";
CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc";

// Check special path which is valid for buildroot with uclibc builds
if(stat(tz_dir_buildroot, &sb) == 0 && S_ISDIR(sb.st_mode))
if (stat(tz_dir_user, &sb) == 0 && S_ISDIR(sb.st_mode))
return tz_dir_user;
else if(stat(tz_dir_buildroot, &sb) == 0 && S_ISDIR(sb.st_mode))
return tz_dir_buildroot;
else if(stat(tz_dir_default, &sb) == 0 && S_ISDIR(sb.st_mode))
return tz_dir_default;
Expand Down