From fe6cc2ae0947c91d9daf844dccc44a8c76deb767 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 9 Aug 2004 07:24:19 +0000 Subject: [BZ #154] Update. 2004-08-09 Ulrich Drepper * time/tzset.c (tzset_internal): If TZ is not set do not compare old and new tz value since it might be /etc/localtime in both cases although the file changed. [BZ #154] Patch by Christian Franke . * time/tzfile.c (__tzfile_read): Determine dev/ino of file. Compare with values of previously opened file. Don't do anything is they match. --- time/tzset.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'time/tzset.c') diff --git a/time/tzset.c b/time/tzset.c index 2274a38f59..aa866918e5 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -159,10 +159,7 @@ tzset_internal (always) /* Examine the TZ environment variable. */ tz = getenv ("TZ"); - if (tz == NULL) - /* No user specification; use the site-wide default. */ - tz = TZDEFAULT; - else if (*tz == '\0') + if (tz && *tz == '\0') /* User specified the empty string; use UTC explicitly. */ tz = "Universal"; @@ -177,6 +174,10 @@ tzset_internal (always) /* No change, simply return. */ return; + if (tz == NULL) + /* No user specification; use the site-wide default. */ + tz = TZDEFAULT; + tz_rules[0].name = NULL; tz_rules[1].name = NULL; -- cgit v1.2.1