svn commit: r196587 - head/usr.sbin/zic
Edwin Groothuis
edwin at FreeBSD.org
Thu Aug 27 12:36:16 UTC 2009
Author: edwin
Date: Thu Aug 27 12:36:15 2009
New Revision: 196587
URL: http://svn.freebsd.org/changeset/base/196587
Log:
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).
Modified:
head/usr.sbin/zic/ (props changed)
head/usr.sbin/zic/zic.c
Modified: head/usr.sbin/zic/zic.c
==============================================================================
--- head/usr.sbin/zic/zic.c Thu Aug 27 12:29:23 2009 (r196586)
+++ head/usr.sbin/zic/zic.c Thu Aug 27 12:36:15 2009 (r196587)
@@ -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);
More information about the svn-src-head
mailing list