diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2009-07-21 02:13:57 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2009-07-21 02:13:57 +0000 |
| commit | 4f9074da93347bbe3167e16ebd27d5bd0e592729 (patch) | |
| tree | 7ce03ce4dcb1f4f80fa271c98ba7df8f03890682 /zic/zic.c | |
| parent | 54e87cd8a2a6bdc86c27282a78c87a339b35e4db (diff) | |
| download | src-4f9074da93347bbe3167e16ebd27d5bd0e592729.tar.gz src-4f9074da93347bbe3167e16ebd27d5bd0e592729.zip | |
Vendor import of tzcode2009kvendor/tzcode/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).
tz-art.htm
Add notes on "A Matter of Life and Death"
(thanks to Dave Cantor).
tz-link.htm
Remove seemingly obsolete public.planetmirror.com/pub/timezone
link (thanks to Nathan Stratton Treadway).
Obtained from: ftp://elsie.nci.nih.gov/pub/
Notes
Notes:
svn path=/vendor/tzcode/dist/; revision=195794
svn path=/vendor/tzcode/tzcode2009k/; revision=195795; tag=vendor/tzcode/tzcode2009k
Diffstat (limited to 'zic/zic.c')
| -rw-r--r-- | zic/zic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zic/zic.c b/zic/zic.c index 01d9f135bd7a..484638a2cb5d 100644 --- a/zic/zic.c +++ b/zic/zic.c @@ -3,7 +3,7 @@ ** 2006-07-17 by Arthur David Olson. */ -static char elsieid[] = "@(#)zic.c 8.19"; +static char elsieid[] = "@(#)zic.c 8.20"; #include "private.h" #include "locale.h" @@ -1921,7 +1921,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); |