Changeset 664

Timestamp:

Sep 8, 2003, 9:56:28 PM (22 years ago)

Author:

zap

Message:

fixed timezone handling.

Location:

trunk/src/emx

Files:

• include/emx/time.h (modified) (1 diff, 1 prop)
• src/lib/sys/__ftime.c (modified) (2 diffs, 1 prop)
• src/lib/time/ftime.c (modified) (1 diff, 1 prop)
• src/lib/time/gettimeo.c (modified) (1 diff, 1 prop)
• src/lib/time/tzset.c (modified) (7 diffs, 1 prop)

trunk/src/emx/include/emx/time.h

@@ -18 +18 @@
 struct tm;
 
+/* Maximum length for time zone standard - "GMT", "CEST" etc. */
+#define __MAX_TZ_STANDARD_LEN 15
+
 struct _tzinfo
 {
-  char tzname[4];
-  char dstzname[4];
+  char tzname[__MAX_TZ_STANDARD_LEN + 1];
+  char dstzname[__MAX_TZ_STANDARD_LEN + 1];
   int tz, dst, shift;
   int sm, sw, sd, st;

trunk/src/emx/src/lib/sys/__ftime.c

@@ -7 +7 @@
 #include <emx/time.h>
 #include <emx/syscalls.h>
+#include <386/builtin.h>
 #include "syscalls.h"
 
+/* Return time in local format */
 void __ftime (struct timeb *ptr)
 {
@@ -21 +23 @@
   tm.tm_mon = now.month - 1;
   tm.tm_year = now.year - 1900;
-  tm.tm_isdst = -1;             /* unknown */
+
   ptr->time = (time_t)_mktime (&tm);
+  /* Apply timezone correction to get UTC time since we don't know what
+     timezone DosGetDateTime uses and whether it honors the TZ variable.
+     Then apply application's own timezone to get local time back. */
+  if (now.timezone != -1)
+    ptr->time = ptr->time - (long)now.timezone * 60 + _tzi.tz;
   ptr->millitm = now.hundredths * 10;
-  ptr->timezone = now.timezone;
-  ptr->dstflag = 0;
 }

trunk/src/emx/src/lib/time/ftime.c

@@ -15 +15 @@
   t_loc = ptr->time;
   ptr->dstflag = _loc2gmt (&ptr->time, -1);
-  ptr->timezone = (int)(ptr->time - t_loc) / 60;
+  ptr->timezone = _tzi.tz / 60;
 }

trunk/src/emx/src/lib/time/gettimeo.c

@@ -25 +25 @@
   if (tzp != NULL)
     {
-      tzp->tz_minuteswest = (int)(tb.time - t_loc) / 60;
+      tzp->tz_minuteswest = _tzi.tz / 60;
       tzp->tz_dsttime = dst;
     }

trunk/src/emx/src/lib/time/tzset.c

@@ -10 +10 @@
 #include <emx/syscalls.h>
 
-int _daylight = 0;
-long _timezone = 0;
-char *_tzname[2] = {"GMT", ""};
+int _STD(daylight) = 0;
+long _STD(timezone) = 0;
+char *_STD(tzname)[2] = {"GMT", ""};
 
 struct _tzinfo _tzi = {"GMT", "", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -88 +88 @@
   p = *pp;
 
-  /* Check the supposed timezone name for validity.  See ISO 9945-1,
-     8.1.1 for details. */
-
-  if (*p == ':' || (*p >= '0' && *p <= '9'))
-    return 0;
-  for (i = 0; i < 3; ++i)
-    if (p[i] == 0 || p[i] == ',' || p[i] == '-' || p[i] == '+')
-      return 0;
+  /* Check the supposed timezone name for validity.
+     See ISO 9945-1, 8.1.1 for details. */
+  if (!(i = strcspn (p, ":,+-")))
+    return 0;
 
   /* The timezone name is valid. */
-
-  memcpy (dst, p, 3);
-  dst[3] = 0;
-  *pp = p + 3;
-  return 1;
-}
-
-
+  *pp = p + i;
+  if (i > __MAX_TZ_STANDARD_LEN)
+    i = __MAX_TZ_STANDARD_LEN;
+  memcpy (dst, p, i);
+  dst [i] = 0;
+  return 1;
+}
+
+static int parse_delta (char **src, int *offset, int opt_sign)
+{
+  int ofs = 0, sign = 1, temp;
+
+  if (!dnum (&ofs, src, -23, 23, opt_sign, -1))
+    return 0;
+  if (ofs < 0)
+    sign = -1, ofs = -ofs;
+
+  ofs *= 60;
+  if (**src == ':')            /* Minutes specified? */
+    {
+      (*src)++;
+      if (!dnum (&temp, src, 0, 59, 0, -1))
+        return 0;
+      ofs += temp;
+    }
+
+  ofs *= 60;
+  if (**src == ':')            /* Seconds specified? */
+    {
+      (*src)++;
+      if (!dnum (&temp, src, 0, 59, 0, -1))
+        return 0;
+      ofs += temp;
+    }
+
+  *offset = sign > 0 ? ofs : -ofs;
+
+  return 1;
+}
+
+static int parse_switchtime (char **src, int *m, int *w, int *d, int *t)
+{
+  if (!dnum (m, src, 1, 12, 0, ',')
+   || !dnum (w, src, -4, 4, 1, ',')
+   || !dnum (d, src, *w ? 0 : 1, *w ? 6 : 31, 0, ',')
+   || !dnum (t, src, 0, 86399, 0, ','))
+    return 0;
+
+  return 1;
+}
+
+/* The format of TZ environment variable:
+ *
+ * TZ1[OFF,[TZ2[,SM,SW,SD,ST,EM,EW,ED,ET,SHIFT]]]
+ *
+ * TZ1 is the at least three-letter name of the standard timezone.
+ *
+ * OFF is the offset to Coordinated Universal Time; positive values are to the
+ * west of the Prime Meridian, negative values are to the east of the Prime
+ * Meridian. The offset has the format [H[:M[:S]]].
+ *
+ * TZ2 is the three-letter name of the summer timezone (daylight saving time).
+ * If TZ2 is not specified, daylight saving time does not apply.
+ *
+ * SM specifies the month (1 through 12) of the change. SW specifies the week
+ * of the change; if this value is zero, SD specifies the day of month
+ * (1 through 31). If SW is positive (1 through 4), the change occurs on
+ * weekday SD (0=Sunday through 6=Saturday) of the SWth week of the specified
+ * month. The first week of a month starts on the first Sunday of the month.
+ * If SW is negative (-1 through -4), the change occurs on weekday SD
+ * (0=Sunday through 6=Saturday) of the -SWth week of the specified month,
+ * counted from the end of the month (that is, -1 specifies the last week of
+ * the month). The last week of a month starts on the last Sunday of the
+ * month. ST specifies the time of the change, in seconds. Note that ST is
+ * specified in local standard time and ET is specified in local daylight
+ * saving time.
+ *
+ * Example:
+ *   CET-1CED,3,-1,0,7200,10,-1,0,10800,3600
+ *   KWT-4KWST,3,-1,0,7200,10,-1,0,10800,3600
+ */
 void _STD(tzset) (void)
 {
@@ -111 +180 @@
   struct timeb tb;
   char *p;
-  int sign, offset, temp;
+  int offset;
   time_t t_loc;
 
   p = getenv ("TZ");
-  if (p == NULL)
-    p = "GMT0";                 /* Our best approximation :-) */
-  if (*p == 0)
-    p = "GMT0";
+  if (p == NULL || *p == 0)
+    p = "GMT";                  /* Our best approximation :-) */
 
   if (!copy_tzname (ntz.tzname, &p))
@@ -124 +191 @@
 
   if (*p == 0)
-    offset = sign = 0;          /* TZ=XYZ is valid (in contrast to POSIX.1) */
-  else
-    {
-      if (!dnum (&offset, &p, -24, 24, 1, -1))
-        return;
-      if (offset < 0)
-        sign = -1, offset = -offset;
-      else
-        sign = 1;
-
-      offset *= 60;
-      if (*p == ':')            /* Minutes specified? */
-        {
-          ++p;
-          if (!dnum (&temp, &p, 0, 59, 0, -1))
-            return;
-          offset += temp;
-        }
-
-      offset *= 60;
-      if (*p == ':')            /* Seconds specified? */
-        {
-          ++p;
-          if (!dnum (&temp, &p, 0, 59, 0, -1))
-            return;
-          offset += temp;
-        }
-    }
-
-  ntz.tz = sign > 0 ? offset : -offset;
+    offset = 0;                 /* TZ=XYZ is valid (in contrast to POSIX.1) */
+  else if (!parse_delta (&p, &offset, 1))
+    return;
+
+  ntz.tz = offset;
 
   ntz.dst = 0;
@@ -162 +204 @@
       ntz.dst = 1;
       if (!copy_tzname (ntz.dstzname, &p))
-        return ;
+        return;
       if (*p == ',')
         {
-          ++p;
-          if (!dnum (&ntz.sm, &p, 1, 12, 0, ',')
-              || !dnum (&ntz.sw, &p, -4, 4, 1, ',')
-              || !dnum (&ntz.sd, &p, ntz.sw ? 0 : 1, ntz.sw ? 6 : 31, 0, ',')
-              || !dnum (&ntz.st, &p, 0, 86399, 0, ',')
-              || !dnum (&ntz.em, &p, 1, 12, 0, ',')
-              || !dnum (&ntz.ew, &p, -4, 4, 1, ',')
-              || !dnum (&ntz.ed, &p, ntz.ew ? 0 : 1, ntz.ew ? 6 : 31, 0, ',')
-              || !dnum (&ntz.et, &p, 0, 86399, 0, ',')
-              || !dnum (&ntz.shift, &p, 0, 86400, 0, 0))
+          p++;
+          /* Parse DST start date/time */
+          if (!parse_switchtime (&p, &ntz.sm, &ntz.sw, &ntz.sd, &ntz.st))
+            return;
+          if (!parse_switchtime (&p, &ntz.em, &ntz.ew, &ntz.ed, &ntz.et))
+            return;
+          if (!dnum (&ntz.shift, &p, 0, 86400, 0, 0))
             return;
         }
@@ -180 +219 @@
         {
           /* VAC++ default values */
-
           ntz.sm = 4;  ntz.sw =  1; ntz.sd = 0; ntz.st = 3600;
           ntz.em = 10; ntz.ew = -1; ntz.ed = 0; ntz.et = 7200;
@@ -194 +232 @@
   /* TODO: Make this thread-safe! */
   _tzi = ntz;
-  _tzname[0] = _tzi.tzname;
-  _tzname[1] = _tzi.dstzname;
+  _STD(tzname)[0] = _tzi.tzname;
+  _STD(tzname)[1] = _tzi.dstzname;
   _compute_dst_table ();
 
   __ftime (&tb);
   t_loc = tb.time;
-  _daylight = _loc2gmt (&tb.time, -1);
-  _timezone = (int)(tb.time - t_loc);
+  _STD(daylight) = _loc2gmt (&tb.time, -1);
+  _STD(timezone) = _tzi.tz;
 
   _tzset_flag = 1;