Sat Apr 20 17:07:17 1996 Ulrich Drepper <drepper@cygnus.com>

[kopensolaris-gnu/glibc.git] / time / tzset.c

diff --git a/time/tzset.c b/time/tzset.c
index 8bc0469..2635155 100644 (file)
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.

 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or


@@ -17,7 +17,6 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 #include <ansidecl.h>
 Cambridge, MA 02139, USA.  */
 
 #include <ansidecl.h>

-#include <localeinfo.h>

 #include <ctype.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <stddef.h>
 #include <stdio.h>


@@ -26,7 +25,7 @@ Cambridge, MA 02139, USA.  */
 #include <time.h>
 
 /* Defined in mktime.c.  */
 #include <time.h>
 
 /* Defined in mktime.c.  */

-extern CONST unsigned short int __mon_lengths[2][12];
+extern CONST unsigned short int __mon_yday[2][13];

 
 #define NOID
 #include "tzfile.h"
 
 #define NOID
 #include "tzfile.h"


@@ -37,16 +36,14 @@ extern void EXFUN(__tzfile_default, (char *std AND char *dst AND
                                     long int stdoff AND long int dstoff));
 extern int EXFUN(__tzfile_compute, (time_t, struct tm));
 
                                     long int stdoff AND long int dstoff));
 extern int EXFUN(__tzfile_compute, (time_t, struct tm));
 

-#ifndef        HAVE_GNU_LD
-#define        __tzname        tzname
-#define        __daylight      daylight
-#define        __timezone      timezone
-#endif
-

 char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };
 int __daylight = 0;
 long int __timezone = 0L;
 
 char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };
 int __daylight = 0;
 long int __timezone = 0L;
 

+weak_alias (__tzname, tzname)
+weak_alias (__daylight, daylight)
+weak_alias (__timezone, timezone)
+

 
 #define        min(a, b)       ((a) < (b) ? (a) : (b))
 #define        max(a, b)       ((a) > (b) ? (a) : (b))
 
 #define        min(a, b)       ((a) < (b) ? (a) : (b))
 #define        max(a, b)       ((a) > (b) ? (a) : (b))


@@ -108,21 +105,20 @@ DEFUN_VOID(__tzset)
     }
 
   if (tz == NULL || *tz == '\0')
     }
 
   if (tz == NULL || *tz == '\0')

-    tz = _time_info->tz;
-  if (tz == NULL || *tz == '\0')

     {
       __tzfile_read((char *) NULL);
       if (!__use_tzfile)
        {
     {
       __tzfile_read((char *) NULL);
       if (!__use_tzfile)
        {

-         size_t len = strlen(_time_info->ut0) + 1;
+         const char UTC[] = "UTC";
+         size_t len = sizeof UTC;

          tz_rules[0].name = (char *) malloc(len);
          if (tz_rules[0].name == NULL)
            return;
          tz_rules[1].name = (char *) malloc(len);
          if (tz_rules[1].name == NULL)
            return;
          tz_rules[0].name = (char *) malloc(len);
          if (tz_rules[0].name == NULL)
            return;
          tz_rules[1].name = (char *) malloc(len);
          if (tz_rules[1].name == NULL)
            return;

-         memcpy((PTR) tz_rules[0].name, _time_info->ut0, len);
-         memcpy((PTR) tz_rules[1].name, _time_info->ut0, len);
+         memcpy ((PTR) tz_rules[0].name, UTC, len);
+         memcpy ((PTR) tz_rules[1].name, UTC, len);

          tz_rules[0].type = tz_rules[1].type = J0;
          tz_rules[0].m = tz_rules[0].n = tz_rules[0].d = 0;
          tz_rules[1].m = tz_rules[1].n = tz_rules[1].d = 0;
          tz_rules[0].type = tz_rules[1].type = J0;
          tz_rules[0].m = tz_rules[0].n = tz_rules[0].d = 0;
          tz_rules[1].m = tz_rules[1].n = tz_rules[1].d = 0;


@@ -135,22 +131,33 @@ DEFUN_VOID(__tzset)
       return;
     }
 
       return;
     }
 

+  /* Clear out old state and reset to unnamed UTC.  */
+  memset (tz_rules, 0, sizeof tz_rules);
+  tz_rules[0].name = tz_rules[1].name = (char *) "";
+

   /* Get the standard timezone name.  */
   /* Get the standard timezone name.  */

-  tz_rules[0].name = (char *) malloc(strlen(tz) + 1);
+  tz_rules[0].name = (char *) malloc (strlen (tz) + 1);

   if (tz_rules[0].name == NULL)
   if (tz_rules[0].name == NULL)

+    /* Don't set __tzset_run so we will try again.  */

     return;
 
   if (sscanf(tz, "%[^0-9,+-]", tz_rules[0].name) != 1 ||
       (l = strlen(tz_rules[0].name)) < 3)
     return;
 
   if (sscanf(tz, "%[^0-9,+-]", tz_rules[0].name) != 1 ||
       (l = strlen(tz_rules[0].name)) < 3)

-    return;
+    {
+      free (tz_rules[0].name);
+      tz_rules[0].name = (char *) "";
+      return;
+    }

 
 

-  tz_rules[0].name = (char *) realloc((PTR) tz_rules[0].name, l + 1);
-  if (tz_rules[0].name == NULL)
-    return;
+  {
+    char *n = realloc ((PTR) tz_rules[0].name, l + 1);
+    if (n != NULL)
+      tz_rules[0].name = n;
+  }

 
   tz += l;
 
 
   tz += l;
 

-  /* Figure out the standard offset from GMT.  */
+  /* Figure out the standard offset from UTC.  */

   if (*tz == '\0' || (*tz != '+' && *tz != '-' && !isdigit(*tz)))
     return;
 
   if (*tz == '\0' || (*tz != '+' && *tz != '-' && !isdigit(*tz)))
     return;
 


@@ -170,7 +177,7 @@ DEFUN_VOID(__tzset)
       break;
     }
   tz_rules[0].offset *= (min(ss, 59) + (min(mm, 59) * 60) +
       break;
     }
   tz_rules[0].offset *= (min(ss, 59) + (min(mm, 59) * 60) +

-                        (min(hh, 12) * 60 * 60));
+                        (min(hh, 23) * 60 * 60));

 
   for (l = 0; l < 3; ++l)
     {
 
   for (l = 0; l < 3; ++l)
     {


@@ -181,19 +188,23 @@ DEFUN_VOID(__tzset)
     }
 
   /* Get the DST timezone name (if any).  */
     }
 
   /* Get the DST timezone name (if any).  */

-  if (*tz == '\0')
-    tz_rules[1].name = (char *) "";
-  else
+  if (*tz != '\0')

     {
     {

-      tz_rules[1].name = (char *) malloc(strlen(tz) + 1);
-      if (tz_rules[1].name == NULL)
-       return;
-      if (sscanf(tz, "%[^0-9,+-]", tz_rules[1].name) != 1 ||
-         (l = strlen(tz_rules[1].name)) < 3)
-       return;
-      tz_rules[1].name = (char *) realloc((PTR) tz_rules[1].name, l + 1);
-      if (tz_rules[1].name == NULL)
-       return;
+      char *n = malloc (strlen(tz) + 1);
+      if (n != NULL)
+       {
+         tz_rules[1].name = n;
+         if (sscanf(tz, "%[^0-9,+-]", tz_rules[1].name) != 1 ||
+             (l = strlen(tz_rules[1].name)) < 3)
+           {
+             free (n);
+             tz_rules[1].name = (char *) "";
+             goto done_names;  /* Punt on name, set up the offsets.  */
+           }
+         n = realloc ((PTR) tz_rules[1].name, l + 1);
+         if (n != NULL)
+           tz_rules[1].name = n;
+       }

     }
 
   tz += l;
     }
 
   tz += l;


@@ -217,23 +228,18 @@ DEFUN_VOID(__tzset)
       ss = 0;
     case 3:
       tz_rules[1].offset *= (min(ss, 59) + (min(mm, 59) * 60) +
       ss = 0;
     case 3:
       tz_rules[1].offset *= (min(ss, 59) + (min(mm, 59) * 60) +

-                            (min(hh, 12) * (60 * 60)));
+                            (min(hh, 23) * (60 * 60)));

       break;
     }
   for (l = 0; l < 3; ++l)
     {
       break;
     }
   for (l = 0; l < 3; ++l)
     {

-      while (isdigit(*tz))
+      while (isdigit (*tz))

        ++tz;
       if (l < 2 && *tz == ':')
        ++tz;
     }
 
        ++tz;
       if (l < 2 && *tz == ':')
        ++tz;
     }
 

-  /* If no standard or DST offset was given, default to GMT
-     for standard and one hour later than standard for DST.  */
-  if (*tz_rules[0].name == '\0')
-    tz_rules[0].offset = 0L;
-  if (*tz_rules[1].name == '\0')
-    tz_rules[1].offset = tz_rules[0].offset + (60 * 60);
+ done_names:

 
   if (*tz == '\0' || (tz[0] == ',' && tz[1] == '\0'))
     {
 
   if (*tz == '\0' || (tz[0] == ',' && tz[1] == '\0'))
     {


@@ -251,22 +257,22 @@ DEFUN_VOID(__tzset)
   for (whichrule = 0; whichrule < 2; ++whichrule)
     {
       register tz_rule *tzr = &tz_rules[whichrule];
   for (whichrule = 0; whichrule < 2; ++whichrule)
     {
       register tz_rule *tzr = &tz_rules[whichrule];

-      
-      if (*tz != '\0' && *tz == ',')
+
+      if (*tz == ',')

        {
          ++tz;
          if (*tz == '\0')
            return;
        }
        {
          ++tz;
          if (*tz == '\0')
            return;
        }

-      
+

       /* Get the date of the change.  */
       /* Get the date of the change.  */

-      if (*tz == 'J' || isdigit(*tz))
+      if (*tz == 'J' || isdigit (*tz))

        {
          char *end;
          tzr->type = *tz == 'J' ? J1 : J0;
        {
          char *end;
          tzr->type = *tz == 'J' ? J1 : J0;

-         if (tzr->type == J1 && !isdigit(*++tz))
+         if (tzr->type == J1 && !isdigit (*++tz))

            return;
            return;

-         tzr->d = (unsigned short int) strtoul(tz, &end, 10);
+         tzr->d = (unsigned short int) strtoul (tz, &end, 10);

          if (end == tz || tzr->d > 365)
            return;
          else if (tzr->type == J1 && tzr->d == 0)
          if (end == tz || tzr->d > 365)
            return;
          else if (tzr->type == J1 && tzr->d == 0)


@@ -303,7 +309,7 @@ DEFUN_VOID(__tzset)
        }
       else
        return;
        }
       else
        return;

-      
+

       if (*tz != '\0' && *tz != '/' && *tz != ',')
        return;
       else if (*tz == '/')
       if (*tz != '\0' && *tz != '/' && *tz != ',')
        return;
       else if (*tz == '/')


@@ -312,10 +318,10 @@ DEFUN_VOID(__tzset)
          ++tz;
          if (*tz == '\0')
            return;
          ++tz;
          if (*tz == '\0')
            return;

-         switch (sscanf(tz, "%hu:%hu:%hu", &hh, &mm, &ss))
+         switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))

            {
            default:
            {
            default:

-             return;
+             hh = 2;           /* Default to 2:00 AM.  */

            case 1:
              mm = 0;
            case 2:
            case 1:
              mm = 0;
            case 2:


@@ -342,6 +348,20 @@ DEFUN_VOID(__tzset)
   __tzset_run = 1;
 }
 \f
   __tzset_run = 1;
 }
 \f

+/* Maximum length of a timezone name.  __tz_compute keeps this up to date
+   (never decreasing it) when ! __use_tzfile.
+   tzfile.c keeps it up to date when __use_tzfile.  */
+long int __tzname_cur_max;
+
+long int
+DEFUN_VOID(__tzname_max)
+{
+  if (! __tzset_run)
+    __tzset ();
+
+  return __tzname_cur_max;
+}
+\f

 /* Figure out the exact time (as a time_t) in YEAR
    when the change described by RULE will occur and
    put it in RULE->change, saving YEAR in RULE->computed_for.
 /* Figure out the exact time (as a time_t) in YEAR
    when the change described by RULE will occur and
    put it in RULE->change, saving YEAR in RULE->computed_for.


@@ -355,7 +375,7 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year)
   if (year != -1 && rule->computed_for == year)
     /* Operations on times in 1969 will be slower.  Oh well.  */
     return 1;
   if (year != -1 && rule->computed_for == year)
     /* Operations on times in 1969 will be slower.  Oh well.  */
     return 1;

-     
+

   /* First set T to January 1st, 0:00:00 GMT in YEAR.  */
   t = 0;
   for (y = 1970; y < year; ++y)
   /* First set T to January 1st, 0:00:00 GMT in YEAR.  */
   t = 0;
   for (y = 1970; y < year; ++y)


@@ -383,10 +403,11 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year)
       /* Mm.n.d - Nth "Dth day" of month M.  */
       {
        register int i, d, m1, yy0, yy1, yy2, dow;
       /* Mm.n.d - Nth "Dth day" of month M.  */
       {
        register int i, d, m1, yy0, yy1, yy2, dow;

+       register CONST unsigned short int *myday =
+         &__mon_yday[__isleap (year)][rule->m];

 
        /* First add SECSPERDAY for each day in months before M.  */
 
        /* First add SECSPERDAY for each day in months before M.  */

-       for (i = 0; i <= rule->m; ++i)
-         t += __mon_lengths[__isleap (year)][i] * SECSPERDAY;
+       t += myday[-1] * SECSPERDAY;

 
        /* Use Zeller's Congruence to get day-of-week of first day of month. */
        m1 = (rule->m + 9) % 12 + 1;
 
        /* Use Zeller's Congruence to get day-of-week of first day of month. */
        m1 = (rule->m + 9) % 12 + 1;


@@ -404,7 +425,7 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year)
          d += 7;
        for (i = 1; i < rule->n; ++i)
          {
          d += 7;
        for (i = 1; i < rule->n; ++i)
          {

-           if (d + 7 >= __mon_lengths[__isleap (year)][rule->m - 1])
+           if (d + 7 >= myday[0] - myday[-1])

              break;
            d += 7;
          }
              break;
            d += 7;
          }


@@ -443,13 +464,17 @@ DEFUN(__tz_compute, (timer, tm),
   __tzname[0] = (char *) tz_rules[0].name;
   __tzname[1] = (char *) tz_rules[1].name;
 
   __tzname[0] = (char *) tz_rules[0].name;
   __tzname[1] = (char *) tz_rules[1].name;
 

+  {
+    /* Keep __tzname_cur_max up to date.  */
+    size_t len0 = strlen (__tzname[0]);
+    size_t len1 = strlen (__tzname[1]);
+    if (len0 > __tzname_cur_max)
+      __tzname_cur_max = len0;
+    if (len1 > __tzname_cur_max)
+      __tzname_cur_max = len1;
+  }
+

   return 1;
 }
 
   return 1;
 }
 

-
-long int
-DEFUN_VOID (__tzname_max)
-{
-  size_t len0 = strlen (__tzname[0]), len1 = strlen (__tzname[1]);
-  return len0 > len1 ? len0 : len1;
-}
+weak_alias (__tzset, tzset)