d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV of r195794

Browse Source 
MFV of tzcode2009k

zic.c:
    Do not end a binary file with a POSIX-style time zone string
    for locations that end up in permanent DST (thanks to Andreas
    Schwab).
This commit is contained in:
Edwin Groothuis 2009-08-27 12:36:15 +00:00
commit 5e2791f090
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/zic/zic.c
View File

@ -3,7 +3,7 @@
** 2006-07-17 by Arthur David Olson.
*/
static const char elsieid[] = "@(#)zic.c 8.19";
static const char elsieid[] = "@(#)zic.c 8.20";
#ifndef lint
static const char rcsid[] =
@ -1892,7 +1892,7 @@ const int zonecount;
if (stdrp != NULL && stdrp->r_hiyear == 2037)
return;
}
if (stdrp == NULL && zp->z_nrules != 0)
if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
return;
abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);