mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 22:00:31 -04:00
7db17950b3
. /etc/localtime is a symlink. . /etc/localtime contains a time zone not recognised by the JDK. Submitted by: Kurt Miller <truk@optonline.net>
101 lines
2.9 KiB
C
101 lines
2.9 KiB
C
$FreeBSD$
|
|
|
|
--- ../../j2se/src/solaris/native/java/util/TimeZone_md.c.orig Tue Apr 12 14:31:28 2005
|
|
+++ ../../j2se/src/solaris/native/java/util/TimeZone_md.c Wed Apr 13 12:59:23 2005
|
|
@@ -39,7 +39,7 @@
|
|
static const char *sysconfig_clock_file = "/etc/sysconfig/clock";
|
|
#endif
|
|
static const char *zoneinfo_dir = "/usr/share/zoneinfo";
|
|
-static const char *defailt_zoneinfo_file = "/etc/localtime";
|
|
+static const char *default_zoneinfo_file = "/etc/localtime";
|
|
|
|
/*
|
|
* Returns a point to the zone ID portion of the given zoneinfo file
|
|
@@ -171,6 +171,7 @@ getPlatformTimeZoneID()
|
|
int fd;
|
|
char *buf;
|
|
size_t size;
|
|
+ char zoneinfo_file[PATH_MAX+1];
|
|
|
|
#if defined(__linux__)
|
|
/*
|
|
@@ -232,11 +233,13 @@ getPlatformTimeZoneID()
|
|
/*
|
|
* Next, try /etc/localtime to find the zone ID.
|
|
*/
|
|
- if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
|
|
+ if (lstat(default_zoneinfo_file, &statbuf) == -1) {
|
|
return NULL;
|
|
}
|
|
|
|
-#if defined(__linux__)
|
|
+ strlcpy(zoneinfo_file, default_zoneinfo_file, PATH_MAX+1);
|
|
+
|
|
+#if defined(__linux__) || defined(_BSD_SOURCE)
|
|
/*
|
|
* If it's a symlink, get the link name and its zone ID part. (The
|
|
* older versions of timeconfig created a symlink as described in
|
|
@@ -245,22 +248,25 @@ getPlatformTimeZoneID()
|
|
* from /etc/localtime.)
|
|
*/
|
|
if (S_ISLNK(statbuf.st_mode)) {
|
|
- char linkbuf[PATH_MAX+1];
|
|
int len;
|
|
|
|
- if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
|
|
+ if ((len = readlink(default_zoneinfo_file, zoneinfo_file, sizeof(zoneinfo_file)-1)) == -1) {
|
|
jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
|
|
- defailt_zoneinfo_file);
|
|
+ default_zoneinfo_file);
|
|
return NULL;
|
|
}
|
|
- linkbuf[len] = '\0';
|
|
- tz = getZoneName(linkbuf);
|
|
+ zoneinfo_file[len] = '\0';
|
|
+ tz = getZoneName(zoneinfo_file);
|
|
if (tz != NULL) {
|
|
tz = strdup(tz);
|
|
+ return tz;
|
|
+ } else {
|
|
+ if (lstat(zoneinfo_file, &statbuf) == -1) {
|
|
+ return NULL;
|
|
+ }
|
|
}
|
|
- return tz;
|
|
}
|
|
-#endif /* __linux__ */
|
|
+#endif /* __linux__ || _BSD_SOURCE */
|
|
|
|
/*
|
|
* If it's a regular file, we need to find out the same zoneinfo file
|
|
@@ -271,7 +277,7 @@ getPlatformTimeZoneID()
|
|
if (buf == NULL) {
|
|
return NULL;
|
|
}
|
|
- if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
|
|
+ if ((fd = open(zoneinfo_file, O_RDONLY)) == -1) {
|
|
free((void *) buf);
|
|
return NULL;
|
|
}
|
|
@@ -548,18 +554,17 @@ getGMTOffsetID()
|
|
return strdup("GMT");
|
|
}
|
|
|
|
- /* Note that the time offset direction is opposite. */
|
|
#if defined(_BSD_SOURCE)
|
|
clock = time(NULL);
|
|
tzset();
|
|
local_tm = localtime(&clock);
|
|
- if (local_tm->tm_gmtoff > 0) {
|
|
+ if (local_tm->tm_gmtoff >= 0) {
|
|
offset = (time_t) local_tm->tm_gmtoff;
|
|
- sign = '-';
|
|
+ sign = '+';
|
|
}
|
|
else {
|
|
offset = (time_t) -local_tm->tm_gmtoff;
|
|
- sign = '+';
|
|
+ sign = '-';
|
|
}
|
|
#else
|
|
if (timezone > 0) {
|