diff options
| author | edwin <edwin@FreeBSD.org> | 2009-08-27 12:36:15 +0000 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2009-08-27 12:36:15 +0000 |
| commit | e62f57adb5813585652e0cb13a1bfc009610f9d9 (patch) | |
| tree | decf0312549d3a70e32cb986170a739bfb5cc2ad /usr.sbin/zic | |
| parent | 140e1930f6f8ef6821eabb0c1f8094ba90f9c509 (diff) | |
| download | FreeBSD-src-e62f57adb5813585652e0cb13a1bfc009610f9d9.zip FreeBSD-src-e62f57adb5813585652e0cb13a1bfc009610f9d9.tar.gz | |
MFV of r195794
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).
Diffstat (limited to 'usr.sbin/zic')
| -rw-r--r-- | usr.sbin/zic/zic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/zic/zic.c b/usr.sbin/zic/zic.c index cb95958..7670056 100644 --- a/usr.sbin/zic/zic.c +++ b/usr.sbin/zic/zic.c @@ -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); |
