author | coffeys |
Tue, 17 Sep 2019 11:07:07 +0000 | |
changeset 58186 | 8ee083465318 |
parent 53029 | 8180809085a4 |
child 58191 | 8a8e87e8a4fd |
permissions | -rw-r--r-- |
2 | 1 |
/* |
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
2 |
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2 | 24 |
*/ |
25 |
||
26 |
#include <stdlib.h> |
|
27 |
#include <stdio.h> |
|
28 |
#include <strings.h> |
|
29 |
#include <time.h> |
|
30 |
#include <limits.h> |
|
31 |
#include <errno.h> |
|
32 |
#include <stddef.h> |
|
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
33 |
#include <sys/stat.h> |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
34 |
#include <sys/types.h> |
2 | 35 |
#include <string.h> |
36 |
#include <dirent.h> |
|
37 |
#include <unistd.h> |
|
32513 | 38 |
#if defined(__solaris__) |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
39 |
#include <libscf.h> |
2 | 40 |
#endif |
41 |
||
42 |
#include "jvm.h" |
|
32513 | 43 |
#include "TimeZone_md.h" |
2 | 44 |
|
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
45 |
static char *isFileIdentical(char* buf, size_t size, char *pathname); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
46 |
|
2 | 47 |
#define SKIP_SPACE(p) while (*p == ' ' || *p == '\t') p++; |
48 |
||
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
49 |
#define RESTARTABLE(_cmd, _result) do { \ |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
50 |
do { \ |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
51 |
_result = _cmd; \ |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
52 |
} while((_result == -1) && (errno == EINTR)); \ |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
53 |
} while(0) |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
54 |
|
2 | 55 |
#if !defined(__solaris__) || defined(__sparcv9) || defined(amd64) |
56 |
#define fileopen fopen |
|
57 |
#define filegets fgets |
|
58 |
#define fileclose fclose |
|
59 |
#endif |
|
60 |
||
53029
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
61 |
#if defined(_ALLBSD_SOURCE) |
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
62 |
#define stat64 stat |
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
63 |
#define lstat64 lstat |
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
64 |
#define fstat64 fstat |
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
65 |
#endif |
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
66 |
|
12047
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
10702
diff
changeset
|
67 |
#if defined(__linux__) || defined(_ALLBSD_SOURCE) |
3740
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
68 |
static const char *ETC_TIMEZONE_FILE = "/etc/timezone"; |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
69 |
static const char *ZONEINFO_DIR = "/usr/share/zoneinfo"; |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
70 |
static const char *DEFAULT_ZONEINFO_FILE = "/etc/localtime"; |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
71 |
#else |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
72 |
static const char *SYS_INIT_FILE = "/etc/default/init"; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
73 |
static const char *ZONEINFO_DIR = "/usr/share/lib/zoneinfo"; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
74 |
static const char *DEFAULT_ZONEINFO_FILE = "/usr/share/lib/zoneinfo/localtime"; |
32513 | 75 |
#endif /* defined(__linux__) || defined(_ALLBSD_SOURCE) */ |
76 |
||
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
77 |
static const char popularZones[][4] = {"UTC", "GMT"}; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
78 |
|
32513 | 79 |
#if defined(_AIX) |
80 |
static const char *ETC_ENVIRONMENT_FILE = "/etc/environment"; |
|
81 |
#endif |
|
82 |
||
83 |
#if defined(__linux__) || defined(MACOSX) || defined(__solaris__) |
|
2 | 84 |
|
85 |
/* |
|
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
86 |
* Returns a pointer to the zone ID portion of the given zoneinfo file |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
87 |
* name, or NULL if the given string doesn't contain "zoneinfo/". |
2 | 88 |
*/ |
89 |
static char * |
|
90 |
getZoneName(char *str) |
|
91 |
{ |
|
92 |
static const char *zidir = "zoneinfo/"; |
|
93 |
||
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
94 |
char *pos = strstr((const char *)str, zidir); |
2 | 95 |
if (pos == NULL) { |
96 |
return NULL; |
|
97 |
} |
|
98 |
return pos + strlen(zidir); |
|
99 |
} |
|
100 |
||
101 |
/* |
|
102 |
* Returns a path name created from the given 'dir' and 'name' under |
|
103 |
* UNIX. This function allocates memory for the pathname calling |
|
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
104 |
* malloc(). NULL is returned if malloc() fails. |
2 | 105 |
*/ |
106 |
static char * |
|
107 |
getPathName(const char *dir, const char *name) { |
|
108 |
char *path; |
|
109 |
||
110 |
path = (char *) malloc(strlen(dir) + strlen(name) + 2); |
|
111 |
if (path == NULL) { |
|
112 |
return NULL; |
|
113 |
} |
|
114 |
return strcat(strcat(strcpy(path, dir), "/"), name); |
|
115 |
} |
|
116 |
||
117 |
/* |
|
118 |
* Scans the specified directory and its subdirectories to find a |
|
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
119 |
* zoneinfo file which has the same content as /etc/localtime on Linux |
12182
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
120 |
* or /usr/share/lib/zoneinfo/localtime on Solaris given in 'buf'. |
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
121 |
* If file is symbolic link, then the contents it points to are in buf. |
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
122 |
* Returns a zone ID if found, otherwise, NULL is returned. |
2 | 123 |
*/ |
124 |
static char * |
|
125 |
findZoneinfoFile(char *buf, size_t size, const char *dir) |
|
126 |
{ |
|
127 |
DIR *dirp = NULL; |
|
51597
4c78f4fd8370
8207744: Clean up inconsistent use of opendir/closedir versus opendir64/closedir64
bpb
parents:
51105
diff
changeset
|
128 |
struct dirent *dp = NULL; |
2 | 129 |
char *pathname = NULL; |
130 |
char *tz = NULL; |
|
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
131 |
int res; |
2 | 132 |
|
133 |
dirp = opendir(dir); |
|
134 |
if (dirp == NULL) { |
|
135 |
return NULL; |
|
136 |
} |
|
137 |
||
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
138 |
if (strcmp(dir, ZONEINFO_DIR) == 0) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
139 |
/* fast path for 1st iteration */ |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
140 |
for (unsigned int i = 0; i < sizeof (popularZones) / sizeof (popularZones[0]); i++) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
141 |
pathname = getPathName(dir, popularZones[i]); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
142 |
if (pathname == NULL) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
143 |
continue; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
144 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
145 |
tz = isFileIdentical(buf, size, pathname); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
146 |
free((void *) pathname); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
147 |
pathname = NULL; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
148 |
if (tz != NULL) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
149 |
return tz; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
150 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
151 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
152 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
153 |
|
51597
4c78f4fd8370
8207744: Clean up inconsistent use of opendir/closedir versus opendir64/closedir64
bpb
parents:
51105
diff
changeset
|
154 |
while ((dp = readdir(dirp)) != NULL) { |
2 | 155 |
/* |
156 |
* Skip '.' and '..' (and possibly other .* files) |
|
157 |
*/ |
|
158 |
if (dp->d_name[0] == '.') { |
|
159 |
continue; |
|
160 |
} |
|
161 |
||
162 |
/* |
|
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
163 |
* Skip "ROC", "posixrules", and "localtime". |
2 | 164 |
*/ |
165 |
if ((strcmp(dp->d_name, "ROC") == 0) |
|
166 |
|| (strcmp(dp->d_name, "posixrules") == 0) |
|
32513 | 167 |
#if defined(__solaris__) |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
168 |
/* |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
169 |
* Skip the "src" and "tab" directories on Solaris. |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
170 |
*/ |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
171 |
|| (strcmp(dp->d_name, "src") == 0) |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
172 |
|| (strcmp(dp->d_name, "tab") == 0) |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
173 |
#endif |
2 | 174 |
|| (strcmp(dp->d_name, "localtime") == 0)) { |
175 |
continue; |
|
176 |
} |
|
177 |
||
178 |
pathname = getPathName(dir, dp->d_name); |
|
179 |
if (pathname == NULL) { |
|
180 |
break; |
|
181 |
} |
|
182 |
||
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
183 |
tz = isFileIdentical(buf, size, pathname); |
2 | 184 |
free((void *) pathname); |
185 |
pathname = NULL; |
|
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
186 |
if (tz != NULL) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
187 |
break; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
188 |
} |
2 | 189 |
} |
190 |
||
191 |
if (dirp != NULL) { |
|
192 |
(void) closedir(dirp); |
|
193 |
} |
|
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
194 |
return tz; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
195 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
196 |
|
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
197 |
/* |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
198 |
* Checks if the file pointed to by pathname matches |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
199 |
* the data contents in buf. |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
200 |
* Returns a representation of the timezone file name |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
201 |
* if file match is found, otherwise NULL. |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
202 |
*/ |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
203 |
static char * |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
204 |
isFileIdentical(char *buf, size_t size, char *pathname) |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
205 |
{ |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
206 |
char *possibleMatch = NULL; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
207 |
struct stat64 statbuf; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
208 |
char *dbuf = NULL; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
209 |
int fd = -1; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
210 |
int res; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
211 |
|
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
212 |
RESTARTABLE(stat64(pathname, &statbuf), res); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
213 |
if (res == -1) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
214 |
return NULL; |
2 | 215 |
} |
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
216 |
|
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
217 |
if (S_ISDIR(statbuf.st_mode)) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
218 |
possibleMatch = findZoneinfoFile(buf, size, pathname); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
219 |
} else if (S_ISREG(statbuf.st_mode) && (size_t)statbuf.st_size == size) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
220 |
dbuf = (char *) malloc(size); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
221 |
if (dbuf == NULL) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
222 |
return NULL; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
223 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
224 |
RESTARTABLE(open(pathname, O_RDONLY), fd); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
225 |
if (fd == -1) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
226 |
goto freedata; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
227 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
228 |
RESTARTABLE(read(fd, dbuf, size), res); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
229 |
if (res != (ssize_t) size) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
230 |
goto freedata; |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
231 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
232 |
if (memcmp(buf, dbuf, size) == 0) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
233 |
possibleMatch = getZoneName(pathname); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
234 |
if (possibleMatch != NULL) { |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
235 |
possibleMatch = strdup(possibleMatch); |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
236 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
237 |
} |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
238 |
freedata: |
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
239 |
free((void *) dbuf); |
2 | 240 |
(void) close(fd); |
241 |
} |
|
58186
8ee083465318
8223490: Optimize search algorithm for determining default time zone
coffeys
parents:
53029
diff
changeset
|
242 |
return possibleMatch; |
2 | 243 |
} |
244 |
||
12047
320a714614e9
7113349: Initial changeset for Macosx port to jdk
michaelm
parents:
10702
diff
changeset
|
245 |
#if defined(__linux__) || defined(MACOSX) |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
246 |
|
2 | 247 |
/* |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
248 |
* Performs Linux specific mapping and returns a zone ID |
2 | 249 |
* if found. Otherwise, NULL is returned. |
250 |
*/ |
|
251 |
static char * |
|
252 |
getPlatformTimeZoneID() |
|
253 |
{ |
|
53029
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
254 |
struct stat64 statbuf; |
2 | 255 |
char *tz = NULL; |
256 |
FILE *fp; |
|
257 |
int fd; |
|
258 |
char *buf; |
|
259 |
size_t size; |
|
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
260 |
int res; |
2 | 261 |
|
32513 | 262 |
#if defined(__linux__) |
2 | 263 |
/* |
3740
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
264 |
* Try reading the /etc/timezone file for Debian distros. There's |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
265 |
* no spec of the file format available. This parsing assumes that |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
266 |
* there's one line of an Olson tzid followed by a '\n', no |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
267 |
* leading or trailing spaces, no comments. |
2 | 268 |
*/ |
3740
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
269 |
if ((fp = fopen(ETC_TIMEZONE_FILE, "r")) != NULL) { |
2 | 270 |
char line[256]; |
271 |
||
3740
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
272 |
if (fgets(line, sizeof(line), fp) != NULL) { |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
273 |
char *p = strchr(line, '\n'); |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
274 |
if (p != NULL) { |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
275 |
*p = '\0'; |
2 | 276 |
} |
3740
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
277 |
if (strlen(line) > 0) { |
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
278 |
tz = strdup(line); |
2 | 279 |
} |
280 |
} |
|
281 |
(void) fclose(fp); |
|
282 |
if (tz != NULL) { |
|
283 |
return tz; |
|
284 |
} |
|
285 |
} |
|
32513 | 286 |
#endif /* defined(__linux__) */ |
2 | 287 |
|
288 |
/* |
|
289 |
* Next, try /etc/localtime to find the zone ID. |
|
290 |
*/ |
|
53029
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
291 |
RESTARTABLE(lstat64(DEFAULT_ZONEINFO_FILE, &statbuf), res); |
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
292 |
if (res == -1) { |
2 | 293 |
return NULL; |
294 |
} |
|
295 |
||
296 |
/* |
|
297 |
* If it's a symlink, get the link name and its zone ID part. (The |
|
298 |
* older versions of timeconfig created a symlink as described in |
|
299 |
* the Red Hat man page. It was changed in 1999 to create a copy |
|
300 |
* of a zoneinfo file. It's no longer possible to get the zone ID |
|
301 |
* from /etc/localtime.) |
|
302 |
*/ |
|
303 |
if (S_ISLNK(statbuf.st_mode)) { |
|
304 |
char linkbuf[PATH_MAX+1]; |
|
305 |
int len; |
|
306 |
||
3740
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
307 |
if ((len = readlink(DEFAULT_ZONEINFO_FILE, linkbuf, sizeof(linkbuf)-1)) == -1) { |
2 | 308 |
jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n", |
3740
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
309 |
DEFAULT_ZONEINFO_FILE); |
2 | 310 |
return NULL; |
311 |
} |
|
312 |
linkbuf[len] = '\0'; |
|
313 |
tz = getZoneName(linkbuf); |
|
314 |
if (tz != NULL) { |
|
315 |
tz = strdup(tz); |
|
12182
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
316 |
return tz; |
2 | 317 |
} |
318 |
} |
|
319 |
||
320 |
/* |
|
321 |
* If it's a regular file, we need to find out the same zoneinfo file |
|
322 |
* that has been copied as /etc/localtime. |
|
12182
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
323 |
* If initial symbolic link resolution failed, we should treat target |
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
324 |
* file as a regular file. |
2 | 325 |
*/ |
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
326 |
RESTARTABLE(open(DEFAULT_ZONEINFO_FILE, O_RDONLY), fd); |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
327 |
if (fd == -1) { |
12182
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
328 |
return NULL; |
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
329 |
} |
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
330 |
|
53029
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
331 |
RESTARTABLE(fstat64(fd, &statbuf), res); |
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
332 |
if (res == -1) { |
12182
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
333 |
(void) close(fd); |
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
334 |
return NULL; |
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
335 |
} |
2 | 336 |
size = (size_t) statbuf.st_size; |
337 |
buf = (char *) malloc(size); |
|
338 |
if (buf == NULL) { |
|
12182
97ccd7eba4f3
7149608: Default TZ detection fails on linux when symbolic links to non default location used.
coffeys
parents:
12047
diff
changeset
|
339 |
(void) close(fd); |
2 | 340 |
return NULL; |
341 |
} |
|
342 |
||
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
343 |
RESTARTABLE(read(fd, buf, size), res); |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
344 |
if (res != (ssize_t) size) { |
2 | 345 |
(void) close(fd); |
346 |
free((void *) buf); |
|
347 |
return NULL; |
|
348 |
} |
|
349 |
(void) close(fd); |
|
350 |
||
3740
efb34ff1cef4
6456628: (tz) Default timezone is incorrectly set occasionally on Linux
peytoia
parents:
2
diff
changeset
|
351 |
tz = findZoneinfoFile(buf, size, ZONEINFO_DIR); |
2 | 352 |
free((void *) buf); |
353 |
return tz; |
|
354 |
} |
|
32513 | 355 |
|
356 |
#elif defined(__solaris__) |
|
357 |
||
2 | 358 |
#if !defined(__sparcv9) && !defined(amd64) |
359 |
||
360 |
/* |
|
361 |
* Those file* functions mimic the UNIX stream io functions. This is |
|
362 |
* because of the limitation of the number of open files on Solaris |
|
363 |
* (32-bit mode only) due to the System V ABI. |
|
364 |
*/ |
|
365 |
||
366 |
#define BUFFER_SIZE 4096 |
|
367 |
||
368 |
static struct iobuffer { |
|
369 |
int magic; /* -1 to distinguish from the real FILE */ |
|
370 |
int fd; /* file descriptor */ |
|
371 |
char *buffer; /* pointer to buffer */ |
|
372 |
char *ptr; /* current read pointer */ |
|
373 |
char *endptr; /* end pointer */ |
|
374 |
}; |
|
375 |
||
376 |
static int |
|
377 |
fileclose(FILE *stream) |
|
378 |
{ |
|
379 |
struct iobuffer *iop = (struct iobuffer *) stream; |
|
380 |
||
381 |
if (iop->magic != -1) { |
|
382 |
return fclose(stream); |
|
383 |
} |
|
384 |
||
385 |
if (iop == NULL) { |
|
386 |
return 0; |
|
387 |
} |
|
388 |
close(iop->fd); |
|
389 |
free((void *)iop->buffer); |
|
390 |
free((void *)iop); |
|
391 |
return 0; |
|
392 |
} |
|
393 |
||
394 |
static FILE * |
|
395 |
fileopen(const char *fname, const char *fmode) |
|
396 |
{ |
|
397 |
FILE *fp; |
|
398 |
int fd; |
|
399 |
struct iobuffer *iop; |
|
400 |
||
401 |
if ((fp = fopen(fname, fmode)) != NULL) { |
|
402 |
return fp; |
|
403 |
} |
|
404 |
||
405 |
/* |
|
406 |
* It assumes read open. |
|
407 |
*/ |
|
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
408 |
RESTARTABLE(open(fname, O_RDONLY), fd); |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
409 |
if (fd == -1) { |
2 | 410 |
return NULL; |
411 |
} |
|
412 |
||
413 |
/* |
|
414 |
* Allocate struct iobuffer and its buffer |
|
415 |
*/ |
|
416 |
iop = malloc(sizeof(struct iobuffer)); |
|
417 |
if (iop == NULL) { |
|
418 |
(void) close(fd); |
|
419 |
errno = ENOMEM; |
|
420 |
return NULL; |
|
421 |
} |
|
422 |
iop->magic = -1; |
|
423 |
iop->fd = fd; |
|
424 |
iop->buffer = malloc(BUFFER_SIZE); |
|
425 |
if (iop->buffer == NULL) { |
|
426 |
(void) close(fd); |
|
427 |
free((void *) iop); |
|
428 |
errno = ENOMEM; |
|
429 |
return NULL; |
|
430 |
} |
|
431 |
iop->ptr = iop->buffer; |
|
432 |
iop->endptr = iop->buffer; |
|
433 |
return (FILE *)iop; |
|
434 |
} |
|
435 |
||
436 |
/* |
|
437 |
* This implementation assumes that n is large enough and the line |
|
438 |
* separator is '\n'. |
|
439 |
*/ |
|
440 |
static char * |
|
441 |
filegets(char *s, int n, FILE *stream) |
|
442 |
{ |
|
443 |
struct iobuffer *iop = (struct iobuffer *) stream; |
|
444 |
char *p; |
|
445 |
||
446 |
if (iop->magic != -1) { |
|
447 |
return fgets(s, n, stream); |
|
448 |
} |
|
449 |
||
450 |
p = s; |
|
451 |
for (;;) { |
|
452 |
char c; |
|
453 |
||
454 |
if (iop->ptr == iop->endptr) { |
|
455 |
ssize_t len; |
|
456 |
||
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
457 |
RESTARTABLE(read(iop->fd, (void *)iop->buffer, BUFFER_SIZE), len); |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
458 |
if (len == -1) { |
2 | 459 |
return NULL; |
460 |
} |
|
461 |
if (len == 0) { |
|
462 |
*p = 0; |
|
463 |
if (s == p) { |
|
464 |
return NULL; |
|
465 |
} |
|
466 |
return s; |
|
467 |
} |
|
468 |
iop->ptr = iop->buffer; |
|
469 |
iop->endptr = iop->buffer + len; |
|
470 |
} |
|
471 |
c = *iop->ptr++; |
|
472 |
*p++ = c; |
|
473 |
if ((p - s) == (n - 1)) { |
|
474 |
*p = 0; |
|
475 |
return s; |
|
476 |
} |
|
477 |
if (c == '\n') { |
|
478 |
*p = 0; |
|
479 |
return s; |
|
480 |
} |
|
481 |
} |
|
482 |
/*NOTREACHED*/ |
|
483 |
} |
|
32513 | 484 |
#endif /* !defined(__sparcv9) && !defined(amd64) */ |
2 | 485 |
|
486 |
/* |
|
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
487 |
* Performs Solaris dependent mapping. Returns a zone ID if |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
488 |
* found. Otherwise, NULL is returned. Solaris libc looks up |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
489 |
* "/etc/default/init" to get the default TZ value if TZ is not defined |
2 | 490 |
* as an environment variable. |
491 |
*/ |
|
492 |
static char * |
|
493 |
getPlatformTimeZoneID() |
|
494 |
{ |
|
495 |
char *tz = NULL; |
|
496 |
FILE *fp; |
|
497 |
||
498 |
/* |
|
499 |
* Try the TZ entry in /etc/default/init. |
|
500 |
*/ |
|
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
501 |
if ((fp = fileopen(SYS_INIT_FILE, "r")) != NULL) { |
2 | 502 |
char line[256]; |
503 |
char quote = '\0'; |
|
504 |
||
505 |
while (filegets(line, sizeof(line), fp) != NULL) { |
|
506 |
char *p = line; |
|
507 |
char *s; |
|
508 |
char c; |
|
509 |
||
510 |
/* quick check for comment lines */ |
|
511 |
if (*p == '#') { |
|
512 |
continue; |
|
513 |
} |
|
514 |
if (strncmp(p, "TZ=", 3) == 0) { |
|
515 |
p += 3; |
|
516 |
SKIP_SPACE(p); |
|
517 |
c = *p; |
|
518 |
if (c == '"' || c == '\'') { |
|
519 |
quote = c; |
|
520 |
p++; |
|
521 |
} |
|
522 |
||
523 |
/* |
|
524 |
* PSARC/2001/383: quoted string support |
|
525 |
*/ |
|
526 |
for (s = p; (c = *s) != '\0' && c != '\n'; s++) { |
|
527 |
/* No '\\' is supported here. */ |
|
528 |
if (c == quote) { |
|
529 |
quote = '\0'; |
|
530 |
break; |
|
531 |
} |
|
532 |
if (c == ' ' && quote == '\0') { |
|
533 |
break; |
|
534 |
} |
|
535 |
} |
|
536 |
if (quote != '\0') { |
|
537 |
jio_fprintf(stderr, "ZoneInfo: unterminated time zone name in /etc/TIMEZONE\n"); |
|
538 |
} |
|
539 |
*s = '\0'; |
|
540 |
tz = strdup(p); |
|
541 |
break; |
|
542 |
} |
|
543 |
} |
|
544 |
(void) fileclose(fp); |
|
545 |
} |
|
546 |
return tz; |
|
547 |
} |
|
548 |
||
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
549 |
#define TIMEZONE_FMRI "svc:/system/timezone:default" |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
550 |
#define TIMEZONE_PG "timezone" |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
551 |
#define LOCALTIME_PROP "localtime" |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
552 |
|
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
553 |
static void |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
554 |
cleanupScf(scf_handle_t *h, |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
555 |
scf_snapshot_t *snap, |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
556 |
scf_instance_t *inst, |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
557 |
scf_propertygroup_t *pg, |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
558 |
scf_property_t *prop, |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
559 |
scf_value_t *val, |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
560 |
char *buf) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
561 |
if (buf != NULL) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
562 |
free(buf); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
563 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
564 |
if (snap != NULL) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
565 |
scf_snapshot_destroy(snap); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
566 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
567 |
if (val != NULL) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
568 |
scf_value_destroy(val); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
569 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
570 |
if (prop != NULL) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
571 |
scf_property_destroy(prop); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
572 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
573 |
if (pg != NULL) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
574 |
scf_pg_destroy(pg); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
575 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
576 |
if (inst != NULL) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
577 |
scf_instance_destroy(inst); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
578 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
579 |
if (h != NULL) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
580 |
scf_handle_destroy(h); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
581 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
582 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
583 |
|
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
584 |
/* |
32513 | 585 |
* Returns a zone ID of Solaris when the TZ value is "localtime". |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
586 |
* First, it tries scf. If scf fails, it looks for the same file as |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
587 |
* /usr/share/lib/zoneinfo/localtime under /usr/share/lib/zoneinfo/. |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
588 |
*/ |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
589 |
static char * |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
590 |
getSolarisDefaultZoneID() { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
591 |
char *tz = NULL; |
53029
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
592 |
struct stat64 statbuf; |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
593 |
size_t size; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
594 |
char *buf; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
595 |
int fd; |
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
596 |
int res; |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
597 |
/* scf specific variables */ |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
598 |
scf_handle_t *h = NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
599 |
scf_snapshot_t *snap = NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
600 |
scf_instance_t *inst = NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
601 |
scf_propertygroup_t *pg = NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
602 |
scf_property_t *prop = NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
603 |
scf_value_t *val = NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
604 |
|
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
605 |
if ((h = scf_handle_create(SCF_VERSION)) != NULL |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
606 |
&& scf_handle_bind(h) == 0 |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
607 |
&& (inst = scf_instance_create(h)) != NULL |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
608 |
&& (snap = scf_snapshot_create(h)) != NULL |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
609 |
&& (pg = scf_pg_create(h)) != NULL |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
610 |
&& (prop = scf_property_create(h)) != NULL |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
611 |
&& (val = scf_value_create(h)) != NULL |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
612 |
&& scf_handle_decode_fmri(h, TIMEZONE_FMRI, NULL, NULL, inst, |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
613 |
NULL, NULL, SCF_DECODE_FMRI_REQUIRE_INSTANCE) == 0 |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
614 |
&& scf_instance_get_snapshot(inst, "running", snap) == 0 |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
615 |
&& scf_instance_get_pg_composed(inst, snap, TIMEZONE_PG, pg) == 0 |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
616 |
&& scf_pg_get_property(pg, LOCALTIME_PROP, prop) == 0 |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
617 |
&& scf_property_get_value(prop, val) == 0) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
618 |
ssize_t len; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
619 |
|
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
620 |
/* Gets the length of the zone ID string */ |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
621 |
len = scf_value_get_astring(val, NULL, 0); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
622 |
if (len != -1) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
623 |
tz = malloc(++len); /* +1 for a null byte */ |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
624 |
if (tz != NULL && scf_value_get_astring(val, tz, len) != -1) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
625 |
cleanupScf(h, snap, inst, pg, prop, val, NULL); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
626 |
return tz; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
627 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
628 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
629 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
630 |
cleanupScf(h, snap, inst, pg, prop, val, tz); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
631 |
|
53029
8180809085a4
8214077: test java/io/File/SetLastModified.java fails on ARM32
alanb
parents:
51597
diff
changeset
|
632 |
RESTARTABLE(stat64(DEFAULT_ZONEINFO_FILE, &statbuf), res); |
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
633 |
if (res == -1) { |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
634 |
return NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
635 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
636 |
size = (size_t) statbuf.st_size; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
637 |
buf = malloc(size); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
638 |
if (buf == NULL) { |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
639 |
return NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
640 |
} |
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
641 |
RESTARTABLE(open(DEFAULT_ZONEINFO_FILE, O_RDONLY), fd); |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
642 |
if (fd == -1) { |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
643 |
free((void *) buf); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
644 |
return NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
645 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
646 |
|
39893
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
647 |
RESTARTABLE(read(fd, buf, size), res); |
56745139718c
7153347: System read/stat/open calls should be hardened to handle EINTR
nishjain
parents:
39887
diff
changeset
|
648 |
if (res != (ssize_t) size) { |
10700
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
649 |
(void) close(fd); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
650 |
free((void *) buf); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
651 |
return NULL; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
652 |
} |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
653 |
(void) close(fd); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
654 |
tz = findZoneinfoFile(buf, size, ZONEINFO_DIR); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
655 |
free((void *) buf); |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
656 |
return tz; |
31c24f40f614
7092679: (tz) Java getting wrong timezone/DST info on Solaris 11
okutsu
parents:
5506
diff
changeset
|
657 |
} |
32513 | 658 |
|
659 |
#endif /* defined(__solaris__) */ |
|
2 | 660 |
|
32513 | 661 |
#elif defined(_AIX) |
662 |
||
22597
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
12689
diff
changeset
|
663 |
static char * |
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
12689
diff
changeset
|
664 |
getPlatformTimeZoneID() |
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
12689
diff
changeset
|
665 |
{ |
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
666 |
FILE *fp; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
667 |
char *tz = NULL; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
668 |
char *tz_key = "TZ="; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
669 |
char line[256]; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
670 |
size_t tz_key_len = strlen(tz_key); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
671 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
672 |
if ((fp = fopen(ETC_ENVIRONMENT_FILE, "r")) != NULL) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
673 |
while (fgets(line, sizeof(line), fp) != NULL) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
674 |
char *p = strchr(line, '\n'); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
675 |
if (p != NULL) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
676 |
*p = '\0'; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
677 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
678 |
if (0 == strncmp(line, tz_key, tz_key_len)) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
679 |
tz = strdup(line + tz_key_len); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
680 |
break; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
681 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
682 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
683 |
(void) fclose(fp); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
684 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
685 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
686 |
return tz; |
22597
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
12689
diff
changeset
|
687 |
} |
7515a991bb37
8024854: PPC64: Basic changes and files to build the class library on AIX
simonis
parents:
12689
diff
changeset
|
688 |
|
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
689 |
static char * |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
690 |
mapPlatformToJavaTimezone(const char *java_home_dir, const char *tz) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
691 |
FILE *tzmapf; |
32513 | 692 |
char mapfilename[PATH_MAX + 1]; |
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
693 |
char line[256]; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
694 |
int linecount = 0; |
32513 | 695 |
char *tz_buf = NULL; |
696 |
char *temp_tz = NULL; |
|
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
697 |
char *javatz = NULL; |
32513 | 698 |
size_t tz_len = 0; |
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
699 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
700 |
/* On AIX, the TZ environment variable may end with a comma |
32513 | 701 |
* followed by modifier fields. These are ignored here. */ |
702 |
temp_tz = strchr(tz, ','); |
|
703 |
tz_len = (temp_tz == NULL) ? strlen(tz) : temp_tz - tz; |
|
704 |
tz_buf = (char *)malloc(tz_len + 1); |
|
705 |
memcpy(tz_buf, tz, tz_len); |
|
706 |
tz_buf[tz_len] = 0; |
|
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
707 |
|
32513 | 708 |
/* Open tzmappings file, with buffer overrun check */ |
709 |
if ((strlen(java_home_dir) + 15) > PATH_MAX) { |
|
710 |
jio_fprintf(stderr, "Path %s/lib/tzmappings exceeds maximum path length\n", java_home_dir); |
|
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
711 |
goto tzerr; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
712 |
} |
32513 | 713 |
strcpy(mapfilename, java_home_dir); |
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
714 |
strcat(mapfilename, "/lib/tzmappings"); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
715 |
if ((tzmapf = fopen(mapfilename, "r")) == NULL) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
716 |
jio_fprintf(stderr, "can't open %s\n", mapfilename); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
717 |
goto tzerr; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
718 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
719 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
720 |
while (fgets(line, sizeof(line), tzmapf) != NULL) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
721 |
char *p = line; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
722 |
char *sol = line; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
723 |
char *java; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
724 |
int result; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
725 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
726 |
linecount++; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
727 |
/* |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
728 |
* Skip comments and blank lines |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
729 |
*/ |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
730 |
if (*p == '#' || *p == '\n') { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
731 |
continue; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
732 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
733 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
734 |
/* |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
735 |
* Get the first field, platform zone ID |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
736 |
*/ |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
737 |
while (*p != '\0' && *p != '\t') { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
738 |
p++; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
739 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
740 |
if (*p == '\0') { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
741 |
/* mapping table is broken! */ |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
742 |
jio_fprintf(stderr, "tzmappings: Illegal format at near line %d.\n", linecount); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
743 |
break; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
744 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
745 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
746 |
*p++ = '\0'; |
32513 | 747 |
if ((result = strncmp(tz_buf, sol, tz_len)) == 0) { |
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
748 |
/* |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
749 |
* If this is the current platform zone ID, |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
750 |
* take the Java time zone ID (2nd field). |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
751 |
*/ |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
752 |
java = p; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
753 |
while (*p != '\0' && *p != '\n') { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
754 |
p++; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
755 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
756 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
757 |
if (*p == '\0') { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
758 |
/* mapping table is broken! */ |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
759 |
jio_fprintf(stderr, "tzmappings: Illegal format at line %d.\n", linecount); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
760 |
break; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
761 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
762 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
763 |
*p = '\0'; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
764 |
javatz = strdup(java); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
765 |
break; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
766 |
} else if (result < 0) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
767 |
break; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
768 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
769 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
770 |
(void) fclose(tzmapf); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
771 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
772 |
tzerr: |
32513 | 773 |
if (tz_buf != NULL ) { |
774 |
free((void *) tz_buf); |
|
775 |
} |
|
776 |
||
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
777 |
if (javatz == NULL) { |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
778 |
return getGMTOffsetID(); |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
779 |
} |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
780 |
|
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
781 |
return javatz; |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
782 |
} |
32513 | 783 |
|
784 |
#endif /* defined(_AIX) */ |
|
785 |
||
786 |
/* |
|
787 |
* findJavaTZ_md() maps platform time zone ID to Java time zone ID |
|
788 |
* using <java_home>/lib/tzmappings. If the TZ value is not found, it |
|
789 |
* trys some libc implementation dependent mappings. If it still |
|
790 |
* can't map to a Java time zone ID, it falls back to the GMT+/-hh:mm |
|
791 |
* form. |
|
792 |
*/ |
|
793 |
/*ARGSUSED1*/ |
|
794 |
char * |
|
795 |
findJavaTZ_md(const char *java_home_dir) |
|
796 |
{ |
|
797 |
char *tz; |
|
798 |
char *javatz = NULL; |
|
799 |
char *freetz = NULL; |
|
800 |
||
801 |
tz = getenv("TZ"); |
|
802 |
||
803 |
if (tz == NULL || *tz == '\0') { |
|
804 |
tz = getPlatformTimeZoneID(); |
|
805 |
freetz = tz; |
|
806 |
} |
|
807 |
||
808 |
if (tz != NULL) { |
|
809 |
/* Ignore preceding ':' */ |
|
810 |
if (*tz == ':') { |
|
811 |
tz++; |
|
812 |
} |
|
813 |
#if defined(__linux__) |
|
814 |
/* Ignore "posix/" prefix on Linux. */ |
|
815 |
if (strncmp(tz, "posix/", 6) == 0) { |
|
816 |
tz += 6; |
|
817 |
} |
|
23929
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
818 |
#endif |
e70b7aee5962
8034220: Improve time zone mapping for AIX platform
luchsh
parents:
22597
diff
changeset
|
819 |
|
32513 | 820 |
#if defined(_AIX) |
821 |
/* On AIX do the platform to Java mapping. */ |
|
822 |
javatz = mapPlatformToJavaTimezone(java_home_dir, tz); |
|
823 |
if (freetz != NULL) { |
|
824 |
free((void *) freetz); |
|
825 |
} |
|
826 |
#else |
|
827 |
#if defined(__solaris__) |
|
828 |
/* Solaris might use localtime, so handle it here. */ |
|
829 |
if (strcmp(tz, "localtime") == 0) { |
|
830 |
javatz = getSolarisDefaultZoneID(); |
|
831 |
if (freetz != NULL) { |
|
832 |
free((void *) freetz); |
|
833 |
} |
|
834 |
} else |
|
835 |
#endif |
|
836 |
if (freetz == NULL) { |
|
837 |
/* strdup if we are still working on getenv result. */ |
|
838 |
javatz = strdup(tz); |
|
839 |
} else if (freetz != tz) { |
|
840 |
/* strdup and free the old buffer, if we moved the pointer. */ |
|
841 |
javatz = strdup(tz); |
|
842 |
free((void *) freetz); |
|
843 |
} else { |
|
844 |
/* we are good if we already work on a freshly allocated buffer. */ |
|
845 |
javatz = tz; |
|
846 |
} |
|
847 |
#endif |
|
848 |
} |
|
849 |
||
850 |
return javatz; |
|
851 |
} |
|
852 |
||
853 |
/** |
|
854 |
* Returns a GMT-offset-based zone ID. (e.g., "GMT-08:00") |
|
855 |
*/ |
|
856 |
||
857 |
#if defined(MACOSX) |
|
858 |
||
859 |
char * |
|
860 |
getGMTOffsetID() |
|
861 |
{ |
|
862 |
time_t offset; |
|
863 |
char sign, buf[32]; |
|
39887
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
864 |
struct tm local_tm; |
32513 | 865 |
time_t clock; |
866 |
||
867 |
clock = time(NULL); |
|
39887
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
868 |
if (localtime_r(&clock, &local_tm) == NULL) { |
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
869 |
return strdup("GMT"); |
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
870 |
} |
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
871 |
offset = (time_t)local_tm.tm_gmtoff; |
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
872 |
if (offset == 0) { |
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
873 |
return strdup("GMT"); |
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
874 |
} |
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
875 |
if (offset > 0) { |
32513 | 876 |
sign = '+'; |
877 |
} else { |
|
39887
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
878 |
offset = -offset; |
32513 | 879 |
sign = '-'; |
880 |
} |
|
881 |
sprintf(buf, (const char *)"GMT%c%02d:%02d", |
|
882 |
sign, (int)(offset/3600), (int)((offset%3600)/60)); |
|
883 |
return strdup(buf); |
|
884 |
} |
|
885 |
||
886 |
#else |
|
887 |
||
888 |
char * |
|
889 |
getGMTOffsetID() |
|
890 |
{ |
|
891 |
time_t offset; |
|
892 |
char sign, buf[32]; |
|
893 |
#if defined(__solaris__) |
|
894 |
struct tm localtm; |
|
895 |
time_t currenttime; |
|
896 |
||
897 |
currenttime = time(NULL); |
|
898 |
if (localtime_r(¤ttime, &localtm) == NULL) { |
|
39887
8d74d858fe75
8066652: Default TimeZone is GMT not local if user.timezone is invalid on Mac OS
rgoel
parents:
32513
diff
changeset
|
899 |
return strdup("GMT"); |
32513 | 900 |
} |
901 |
||
902 |
offset = localtm.tm_isdst ? altzone : timezone; |
|
903 |
#else |
|
904 |
offset = timezone; |
|
905 |
#endif |
|
906 |
||
907 |
if (offset == 0) { |
|
908 |
return strdup("GMT"); |
|
909 |
} |
|
910 |
||
911 |
/* Note that the time offset direction is opposite. */ |
|
912 |
if (offset > 0) { |
|
913 |
sign = '-'; |
|
914 |
} else { |
|
915 |
offset = -offset; |
|
916 |
sign = '+'; |
|
917 |
} |
|
918 |
sprintf(buf, (const char *)"GMT%c%02d:%02d", |
|
919 |
sign, (int)(offset/3600), (int)((offset%3600)/60)); |
|
920 |
return strdup(buf); |
|
921 |
} |
|
922 |
#endif /* MACOSX */ |