From 860d3729868a749f782f6ad5dae1138cb239c4d3 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 Dec 1996 01:40:21 +0000 Subject: update from main archive 961215 Mon Dec 16 02:15:42 1996 Ulrich Drepper Make sure tzset() sets always tzname[]. * time/tzfile.c: De-ANSI-declfy. (find_transition): New function. Set tzname according to given time. (__tzread_file): Use find_transition to set tzname. (__tzfile_compute): Use find_transition instead of doing the work self. * time/tzset.c (tzset): Set tzname[] directly only if !__use_tzfile. Sun Dec 15 16:52:34 1996 Ulrich Drepper * login/utmp-file.c (pututline_file): Open file if closed. Reported by Roma Ekzhanov . Use fcntl instead of flock. Sun Dec 15 14:20:51 1996 Ulrich Drepper * manual/time.texi: Update documentation of strftime function. --- time/tzset.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'time/tzset.c') diff --git a/time/tzset.c b/time/tzset.c index 6a9ebe1..bbd562d 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -514,9 +514,12 @@ tzset (void) __tzset (); - /* Set `tzname'. */ - __tzname[0] = (char *) tz_rules[0].name; - __tzname[1] = (char *) tz_rules[1].name; + if (!__use_tzfile) + { + /* Set `tzname'. */ + __tzname[0] = (char *) tz_rules[0].name; + __tzname[1] = (char *) tz_rules[1].name; + } __libc_lock_unlock (__tzset_lock); } -- cgit v1.1