natSystem.cc (getSystemTimeZone): Only use tm_gmtoff and timezone if they are availab...

	* java/lang/natSystem.cc (getSystemTimeZone): Only use tm_gmtoff
	and timezone if they are available on the system.

From-SVN: r39283

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3f244b7b46210d360eae5f3ed80af90393865daf..7169f8679a97d84bf97b9a5a0d71864004fc7a1f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-26  Warren Levy  <warrenl@redhat.com>
+
+       * java/lang/natSystem.cc (getSystemTimeZone): Only use tm_gmtoff
+       and timezone if they are available on the system.
+
 2001-01-24  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/sf_fabs.c: Use uint32_t, not __uint32_t.

diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index c94ad75a8c4033e1dd501a53b3127def61a26c73..3e96559e8f029a5c821db4073c4ebe87b3a6eda4 100644 (file)
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -240,15 +240,28 @@ getpwuid_adaptor(T_passwd * (*getpwuid_r)(T_uid user_id, T_passwd *pwd_r,
 jstring
 java::lang::System::getSystemTimeZone (void)
 {
+  struct tm *tim;
   time_t current_time;
   char **tzinfo, *tzid;
   long tzoffset;
 
   current_time = time(0);
 
-  mktime(localtime(&current_time));
+  mktime(tim = localtime(&current_time));
+#ifdef STRUCT_TM_HAS_GMTOFF
+  tzoffset = -(tim->tm_gmtoff);        // tm_gmtoff is secs EAST of UTC.
+#elif HAVE_TIMEZONE
+  tzoffset = timezone;         // timezone is secs WEST of UTC.
+#else
+  // FIXME: there must be another global if neither tm_gmtoff nor timezone
+  // is available, esp. if tzname is valid.
+  // Richard Earnshaw <rearnsha@arm.com> has suggested using difftime to
+  // calculate between gmtime and localtime (and accounting for possible
+  // daylight savings time) as an alternative.  Also note that this same
+  // issue exists in java/util/natGregorianCalendar.cc.
+  tzoffset = 0L;
+#endif
   tzinfo = tzname;
-  tzoffset = timezone;
 
   if ((tzoffset % 3600) == 0)
     tzoffset = tzoffset / 3600;