organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-16 10:17:23 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 10

ICU-5086 Try out better timezone detection.

Browse source 
The default detection without the TZ environment variable still needs to be fixed.

X-SVN-Rev: 19316
This commit is contained in:
George Rhoten 2006-03-03 01:05:05 +00:00
parent a174b70acd
commit 5b679e213a
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
icu4c/source/common/putil.c
View file

@ -748,6 +748,7 @@ uprv_tzname(int n)
}
#else
const char *tzenv = NULL;
#if defined(U_DARWIN)
int ret;
@ -755,25 +756,8 @@ uprv_tzname(int n)
if (tzenv != NULL) {
return tzenv;
}
#if !UCONFIG_NO_FILE_IO
/* Caller must handle threading issues */
if (gTimeZoneBufferPtr == NULL) {
ret = readlink(TZZONELINK, gTimeZoneBuffer, sizeof(gTimeZoneBuffer));
if (0 < ret) {
gTimeZoneBuffer[ret] = 0;
if (uprv_strncmp(gTimeZoneBuffer, TZZONEINFO, sizeof(TZZONEINFO) - 1) == 0) {
return (gTimeZoneBufferPtr = gTimeZoneBuffer + sizeof(TZZONEINFO) - 1);
}
}
}
else {
return gTimeZoneBufferPtr;
}
#endif
#endif
#if !UCONFIG_NO_FILE_IO
/* TZ is sometimes set to "PST8PDT" or similar, so we cannot use it.
The rest of the time it could be an Olson ID. George */
tzenv = getenv("TZ");
@ -788,6 +772,21 @@ uprv_tzname(int n)
return tzenv;
}
/* else U_TZNAME will give a better result. */
#if defined(U_DARWIN) && !UCONFIG_NO_FILE_IO
/* Caller must handle threading issues */
if (gTimeZoneBufferPtr == NULL) {
ret = readlink(TZZONELINK, gTimeZoneBuffer, sizeof(gTimeZoneBuffer));
if (0 < ret) {
gTimeZoneBuffer[ret] = 0;
if (uprv_strncmp(gTimeZoneBuffer, TZZONEINFO, sizeof(TZZONEINFO) - 1) == 0) {
return (gTimeZoneBufferPtr = gTimeZoneBuffer + sizeof(TZZONEINFO) - 1);
}
}
}
else {
return gTimeZoneBufferPtr;
}
#endif
#endif