Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't modify tzname unless we are the non-reentrant version.

This commit is contained in:
christos 2011-06-16 22:40:17 +00:00
parent 71ef0adbc7
commit 548c989a0b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/time/localtime.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: localtime.c,v 1.56 2011/02/21 22:07:44 christos Exp $ */
/* $NetBSD: localtime.c,v 1.57 2011/06/16 22:40:17 christos Exp $ */
/*
** This file is in the public domain, so clarified as of
@ -10,7 +10,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.9";
#else
__RCSID("$NetBSD: localtime.c,v 1.56 2011/02/21 22:07:44 christos Exp $");
__RCSID("$NetBSD: localtime.c,v 1.57 2011/06/16 22:40:17 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -1386,7 +1386,8 @@ localsub(const timezone_t sp, const time_t * const timep, const long offset,
*/
result = timesub(sp, &t, ttisp->tt_gmtoff, tmp);
tmp->tm_isdst = ttisp->tt_isdst;
tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind];
if (sp == lclptr)
tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind];
#ifdef TM_ZONE
tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
#endif /* defined TM_ZONE */