-Fri Nov 13 11:57:21 1998 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
+1998-11-13 Ulrich Drepper <drepper@cygnus.com>
+
+ * libio/bits/stdio.h: Correct and improve fread_unlocked and
+ fwrite_unlocked optimizations.
+
+ * time/tzfile.c (__tzfile_read): Set __tzname based on last names
+ in time not to last entries in the file.
+ (__tzfile_compute): Likewise. Fix for PR libc/863.
+
+ * timezone/Makefile: Generate GB timezone data for test.
+ * timezone/tst-timezone.c: More tests for DST switching time (disabled
+ for now).
+
+1998-11-13 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/sysdep.h (INLINE_SYSCALL): Remove
d0 from clobber list.
__exit_status with `__'. Rename pad member of struct utmpx to
__unused.
(RUN_LVL): Define unconditionally.
- * sysdeps/gnu/bits/utmp.h: Rename pad member of struct utmpx to
+ * sysdeps/gnu/bits/utmp.h: Rename pad member of struct utmp to
__unused.
1998-11-12 Philip Blundell <philb@gnu.org>
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <stdlib.h>
+#include <assert.h>
+#include <limits.h>
#include <stdio.h>
-#include <time.h>
+#include <stdlib.h>
#include <string.h>
-#include <limits.h>
+#include <time.h>
#include <unistd.h>
#define NOID
if (num_transitions > 0)
{
- transitions = (time_t *) malloc (num_transitions * sizeof(time_t));
+ transitions = (time_t *) malloc (num_transitions * sizeof (time_t));
if (transitions == NULL)
goto lose;
type_idxs = (unsigned char *) malloc (num_transitions);
processed when sizeof (time_t) > 4. */
i = num_transitions;
while (i-- > 0)
- transitions[i] = decode ((char *) transitions + i*4);
+ transitions[i] = decode ((char *) transitions + i * 4);
}
for (i = 0; i < num_types; ++i)
fclose (f);
+ /* First "register" all timezone names. */
+ for (i = 0; i < num_types; ++i)
+ (void) __tzstring (&zone_names[types[i].idx]);
+
/* Find the standard and daylight time offsets used by the rule file.
We choose the offsets in the types of each flavor that are
transitioned to earliest in time. */
+ __tzname[0] = NULL;
__tzname[1] = NULL;
- for (i = 0; i < num_types; ++i)
- __tzname[types[i].isdst] = __tzstring (&zone_names[types[i].idx]);
+ for (i = num_transitions; i > 0; )
+ {
+ int type = type_idxs[--i];
+ int dst = types[type].isdst;
+ int idx = types[type].idx;
+
+ if (__tzname[dst] == NULL)
+ {
+ __tzname[dst] = __tzstring (&zone_names[idx]);
+
+ if (__tzname[1 - dst] != NULL)
+ break;
+ }
+ }
+ if (__tzname[0] == NULL)
+ {
+ /* This should only happen if there are no transition rules.
+ In this case there should be only one single type. */
+ assert (num_types == 1);
+ __tzname[0] = __tzstring (zone_names);
+ }
if (__tzname[1] == NULL)
__tzname[1] = __tzname[0];
struct ttinfo *info = find_transition (timer);
__daylight = rule_stdoff != rule_dstoff;
__timezone = -rule_stdoff;
+ __tzname[0] = NULL;
__tzname[1] = NULL;
- for (i = 0; i < num_types; ++i)
- __tzname[types[i].isdst] = __tzstring (&zone_names[types[i].idx]);
+ for (i = num_transitions; i > 0; )
+ {
+ int type = type_idxs[--i];
+ int dst = types[type].isdst;
+ int idx = types[type].idx;
+
+ if (__tzname[dst] == NULL)
+ {
+ __tzname[dst] = __tzstring (&zone_names[idx]);
+
+ if (__tzname[1 - dst] != NULL)
+ break;
+ }
+ }
+ if (__tzname[0] == NULL)
+ {
+ /* This should only happen if there are no transition rules.
+ In this case there should be only one single type. */
+ assert (num_types == 1);
+ __tzname[0] = __tzstring (zone_names);
+ }
if (__tzname[1] == NULL)
/* There is no daylight saving time. */
__tzname[1] = __tzname[0];
endef
-ifndef avoid-generated
+ifndef no_deps
-include $(addprefix $(objpfx)z.,$(tzfiles))
endif
$(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \
Europe/Berlin Universal \
Australia/Melbourne \
- America/Sao_Paulo Asia/Tokyo)
+ America/Sao_Paulo Asia/Tokyo GB)
test-tz-ENV = TZDIR=$(testdata)
tst-timezone-ENV = TZDIR=$(testdata)
$(build-testdata)
$(testdata)/Asia/Tokyo: asia $(objpfx)zic $(leapseconds) yearistype
$(build-testdata)
+$(testdata)/GB: europe $(objpfx)zic $(leapseconds) yearistype
+ $(build-testdata)
$(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
{ "Universal", 0, 0, {"UTC", "UTC" }},
{ "Australia/Melbourne", 1, -36000, { "EST", "EST" }},
{ "America/Sao_Paulo", 1, 10800, {"EST", "EDT" }},
+ { "America/Chicago", 1, 21600, {"CST", "CDT" }},
{ "America/Los_Angeles", 1, 28800, {"PST", "PDT" }},
{ "Asia/Tokyo", 0, -32400, {"JST", "JST" }},
{ NULL, 0, 0 }
check_tzvars (pt->name, pt->daylight, pt->timezone, pt->tzname);
}
+#if 0
+ /* From a port of Scott Harrington <seh4@ix.netcom.com> to the timezone
+ mailing list. */
+ {
+ struct tm tmBuf = {0, 0, 0, 10, 3, 98, 0, 0, -1};
+ char buf[200];
+ putenv ("TZ=GB");
+ t = mktime (&tmBuf);
+ snprintf (buf, sizeof (buf), "TZ=%s %ld %d %d %d %d %d %d %d %d %d",
+ getenv ("TZ"), t,
+ tmBuf.tm_sec, tmBuf.tm_min, tmBuf.tm_hour,
+ tmBuf.tm_mday, tmBuf.tm_mon, tmBuf.tm_year,
+ tmBuf.tm_wday, tmBuf.tm_yday, tmBuf.tm_isdst);
+ fputs (buf, stdout);
+ puts (" should be");
+ puts ("TZ=GB 892162800 0 0 0 10 3 98 5 99 1");
+ failed |= strcmp (buf, "TZ=GB 892162800 0 0 0 10 3 98 5 99 1") != 0;
+ }
+
+ printf("\n");
+
+ {
+ struct tm tmBuf = {0, 0, 0, 10, 3, 98, 0, 0, -1};
+ char buf[200];
+ putenv ("TZ=GMT");
+ t = mktime (&tmBuf);
+ snprintf (buf, sizeof (buf), "TZ=%s %ld %d %d %d %d %d %d %d %d %d",
+ getenv ("TZ"), t,
+ tmBuf.tm_sec, tmBuf.tm_min, tmBuf.tm_hour,
+ tmBuf.tm_mday, tmBuf.tm_mon, tmBuf.tm_year,
+ tmBuf.tm_wday, tmBuf.tm_yday, tmBuf.tm_isdst);
+ fputs (buf, stdout);
+ puts (" should be");
+ puts ("TZ=GMT 892166400 0 0 0 10 3 98 5 99 0");
+ failed |= strcmp (buf, "TZ=GMT 892166400 0 0 0 10 3 98 5 99 0") != 0;
+ }
+#endif
+
return failed ? EXIT_FAILURE : EXIT_SUCCESS;
}
projects / platform / upstream / glibc.git / commitdiff