diff options
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 272dfb6381b..2026ed425f2 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2495,13 +2495,14 @@ char *root_name_end; */ my_bool -scan_tz_dir(char * name_end) +scan_tz_dir(char * name_end, uint symlink_recursion_level) { MY_DIR *cur_dir; char *name_end_tmp; uint i; - if (!(cur_dir= my_dir(fullname, MYF(MY_WANT_STAT)))) + /* Sort directory data, to pass mtr tests on different platforms. */ + if (!(cur_dir= my_dir(fullname, MYF(MY_WANT_STAT|MY_WANT_SORT)))) return 1; name_end= strmake(name_end, "/", FN_REFLEN - (name_end - fullname)); @@ -2515,7 +2516,32 @@ scan_tz_dir(char * name_end) if (MY_S_ISDIR(cur_dir->dir_entry[i].mystat->st_mode)) { - if (scan_tz_dir(name_end_tmp)) + my_bool is_symlink; + if ((is_symlink= my_is_symlink(fullname)) && + symlink_recursion_level > 0) + { + /* + The timezone definition data in some Linux distributions + (e.g. the "timezone-data-2013f" package in Gentoo) + may have synlimks like: + /usr/share/zoneinfo/posix/ -> /usr/share/zoneinfo/, + so the same timezone files are available under two names + (e.g. "CET" and "posix/CET"). + + We allow one level of symlink recursion for backward + compatibility with earlier timezone data packages that have + duplicate copies of the same timezone files inside the root + directory and the "posix" subdirectory (instead of symlinking). + This makes "posix/CET" still available, but helps to avoid + following such symlinks infinitely: + /usr/share/zoneinfo/posix/posix/posix/.../posix/ + */ + fflush(stdout); + fprintf(stderr, "Warning: Skipping directory '%s': " + "to avoid infinite symlink recursion.\n", fullname); + continue; + } + if (scan_tz_dir(name_end_tmp, symlink_recursion_level + is_symlink)) { my_dirend(cur_dir); return 1; @@ -2527,14 +2553,20 @@ scan_tz_dir(char * name_end) if (!tz_load(fullname, &tz_info, &tz_storage)) print_tz_as_sql(root_name_end + 1, &tz_info); else + { + fflush(stdout); fprintf(stderr, "Warning: Unable to load '%s' as time zone. Skipping it.\n", fullname); + } free_root(&tz_storage, MYF(0)); } else + { + fflush(stdout); fprintf(stderr, "Warning: '%s' is not regular file or directory\n", fullname); + } } } @@ -2567,8 +2599,9 @@ main(int argc, char **argv) printf("TRUNCATE TABLE time_zone_transition;\n"); printf("TRUNCATE TABLE time_zone_transition_type;\n"); - if (scan_tz_dir(root_name_end)) + if (scan_tz_dir(root_name_end, 0)) { + fflush(stdout); fprintf(stderr, "There were fatal errors during processing " "of zoneinfo directory\n"); return 1; @@ -2587,6 +2620,7 @@ main(int argc, char **argv) { if (tz_load(argv[2], &tz_info, &tz_storage)) { + fflush(stdout); fprintf(stderr, "Problems with zoneinfo file '%s'\n", argv[2]); return 1; } @@ -2596,6 +2630,7 @@ main(int argc, char **argv) { if (tz_load(argv[1], &tz_info, &tz_storage)) { + fflush(stdout); fprintf(stderr, "Problems with zoneinfo file '%s'\n", argv[2]); return 1; } @@ -2605,6 +2640,7 @@ main(int argc, char **argv) free_root(&tz_storage, MYF(0)); } + my_end(0); return 0; } |