AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7200 Skip certain tz file when searching for system time zone.

Browse Source 
X-SVN-Rev: 26815
This commit is contained in:
Michael Ow 2009-10-28 19:59:29 +00:00
parent 6ff64495e1
commit 213239011c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icu4c/source/common/putil.c
View File

@ -620,6 +620,7 @@ extern U_IMPORT char *U_TZNAME[];
#else
#define TZDEFAULT "/etc/localtime"
#define TZZONEINFO "/usr/share/zoneinfo/"
#define TZFILE_SKIP "posixrules"
#endif
#if U_HAVE_DIRENT_H
#define SEARCH_TZFILE
@ -841,6 +842,7 @@ static UBool compareBinaryFiles(const char* defaultTZFileName, const char* TZFil
#define SKIP2 ".."
static char SEARCH_TZFILE_RESULT[MAX_PATH_SIZE] = "";
static char* searchForTZFile(const char* path, DefaultTZInfo* tzInfo) {
char curpath[MAX_PATH_SIZE];
DIR* dirp = opendir(path);
DIR* subDirp = NULL;
struct dirent* dirEntry = NULL;
@ -851,7 +853,6 @@ static char* searchForTZFile(const char* path, DefaultTZInfo* tzInfo) {
}
/* Save the current path */
char curpath[MAX_PATH_SIZE];
uprv_memset(curpath, 0, MAX_PATH_SIZE);
uprv_strcpy(curpath, path);
@ -868,7 +869,7 @@ static char* searchForTZFile(const char* path, DefaultTZInfo* tzInfo) {
closedir(subDirp);
uprv_strcat(newpath, "/");
result = searchForTZFile(newpath, tzInfo);
} else {
} else if (uprv_strcmp(TZFILE_SKIP, dirEntry->d_name) != 0) {
if(compareBinaryFiles(TZDEFAULT, newpath, tzInfo)) {
uprv_strcpy(SEARCH_TZFILE_RESULT, newpath + (sizeof(TZZONEINFO) - 1));
result = SEARCH_TZFILE_RESULT;