diff options
Diffstat (limited to 'src/libical/icaltimezone.c')
| -rw-r--r-- | src/libical/icaltimezone.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/libical/icaltimezone.c b/src/libical/icaltimezone.c index f4f53c61..a93e224c 100644 --- a/src/libical/icaltimezone.c +++ b/src/libical/icaltimezone.c @@ -162,7 +162,7 @@ static void icaltimezone_parse_zone_tab(void); static char *icaltimezone_load_get_line_fn(char *s, size_t size, void *data); static void format_utc_offset(int utc_offset, char *buffer, size_t buffer_size); -static const char *get_zone_directory(void); +static const char *get_zone_directory_builtin(void); static void icaltimezone_builtin_lock(void) { @@ -1678,7 +1678,7 @@ static void icaltimezone_parse_zone_tab(void) zonedir = icaltzutil_get_zone_directory(); zonetab = ZONES_TAB_SYSTEM_FILENAME; } else { - zonedir = get_zone_directory(); + zonedir = get_zone_directory_builtin(); zonetab = ZONES_TAB_FILENAME; } @@ -1829,7 +1829,7 @@ static void icaltimezone_load_builtin_timezone(icaltimezone *zone) FILE *fp; icalparser *parser; - filename_len = strlen(get_zone_directory()) + strlen(zone->location) + 6; + filename_len = strlen(get_zone_directory_builtin()) + strlen(zone->location) + 6; filename = (char *)icalmemory_new_buffer(filename_len); if (!filename) { @@ -1837,7 +1837,7 @@ static void icaltimezone_load_builtin_timezone(icaltimezone *zone) goto out; } - snprintf(filename, filename_len, "%s/%s.ics", get_zone_directory(), zone->location); + snprintf(filename, filename_len, "%s/%s.ics", get_zone_directory_builtin(), zone->location); fp = fopen(filename, "r"); icalmemory_free_buffer(filename); @@ -2006,7 +2006,7 @@ static void format_utc_offset(int utc_offset, char *buffer, size_t buffer_size) } } -static const char *get_zone_directory(void) +static const char *get_zone_directory_builtin(void) { #if !defined(_WIN32) return zone_files_directory == NULL ? ZONEINFO_DIRECTORY : zone_files_directory; @@ -2141,6 +2141,15 @@ static const char *get_zone_directory(void) #endif } +const char *get_zone_directory(void) +{ + if (use_builtin_tzdata) { + return get_zone_directory_builtin(); + } else { + return icaltzutil_get_zone_directory(); + } +} + void set_zone_directory(const char *path) { if (zone_files_directory) |