mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-06 14:10:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

(tzset_internal): Set __timezone before returning.

Browse Source
This commit is contained in:
Ulrich Drepper 1998-09-10 14:51:55 +00:00
parent 0fdf7aeb83
commit 247c6b0614
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
time/tzset.c
View File

@ -334,7 +334,7 @@ tzset_internal (always)
tz_rules[1].name = tz_rules[0].name;
tz_rules[1].offset = tz_rules[0].offset;
free (tzbuf);
return;
goto out;
}
done_names:
@ -355,12 +355,12 @@ tzset_internal (always)
char *end;
tzr->type = *tz == 'J' ? J1 : J0;
if (tzr->type == J1 && !isdigit (*++tz))
return;
goto out;
tzr->d = (unsigned short int) strtoul (tz, &end, 10);
if (end == tz || tzr->d > 365)
return;
goto out;
else if (tzr->type == J1 && tzr->d == 0)
return;
goto out;
tz = end;
}
else if (*tz == 'M')
@ -371,7 +371,7 @@ tzset_internal (always)
&tzr->m, &tzr->n, &tzr->d, &n) != 3 ||
tzr->m < 1 || tzr->m > 12 ||
tzr->n < 1 || tzr->n > 5 || tzr->d > 6)
return;
goto out;
tz += n;
}
else if (*tz == '\0')
@ -392,16 +392,16 @@ tzset_internal (always)
}
}
else
return;
goto out;
if (*tz != '\0' && *tz != '/' && *tz != ',')
return;
goto out;
else if (*tz == '/')
{
/* Get the time of day of the change. */
++tz;
if (*tz == '\0')
return;
goto out;
switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))
{
default:
@ -428,6 +428,10 @@ tzset_internal (always)
tzr->computed_for = -1;
}
out:
/* We know the offset now, set `__timezone'. */
__timezone = -tz_rules[0].offset;
}
/* Maximum length of a timezone name. __tz_compute keeps this up to date